From 1cb1805b292f06c08f5d3878e00275411cc8909a Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 2 Aug 2022 18:57:39 +0200 Subject: [PATCH 01/60] Draft version --- cvat-core/src/annotations.ts | 15 +- cvat-core/src/enums.ts | 15 + cvat-core/src/project-implementation.ts | 31 +- cvat-core/src/project.ts | 63 ++- cvat-core/src/server-proxy.ts | 371 ++++++++++++------ cvat-core/src/session.ts | 79 +++- cvat-core/src/storage.ts | 89 +++++ cvat-ui/src/actions/export-actions.ts | 50 ++- cvat-ui/src/actions/import-actions.ts | 102 ++++- cvat-ui/src/actions/import-backup-actions.ts | 47 +++ cvat-ui/src/actions/projects-actions.ts | 84 ++-- cvat-ui/src/actions/tasks-actions.ts | 206 +++++----- .../components/actions-menu/actions-menu.tsx | 18 +- .../components/actions-menu/load-submenu.tsx | 1 + .../top-bar/annotation-menu.tsx | 19 +- .../create-project-content.tsx | 65 ++- .../advanced-configuration-form.tsx | 209 ++++++++-- .../create-task-page/create-task-content.tsx | 42 +- cvat-ui/src/components/cvat-app.tsx | 6 + .../export-backup/export-backup-modal.tsx | 178 +++++++++ .../src/components/export-backup/styles.scss | 13 + .../export-dataset/export-dataset-modal.tsx | 137 +++++-- .../file-manager/cloud-storages-tab.tsx | 82 +--- .../components/file-manager/file-manager.tsx | 1 + .../import-backup/import-backup-modal.tsx | 152 +++++++ .../styles.scss | 0 .../import-dataset-modal.tsx | 153 -------- .../import-dataset/import-dataset-modal.tsx | 352 +++++++++++++++++ .../import-dataset-status-modal.tsx | 0 .../src/components/import-dataset/styles.scss | 32 ++ cvat-ui/src/components/jobs-page/job-card.tsx | 6 + .../components/project-page/project-page.tsx | 4 +- .../components/projects-page/actions-menu.tsx | 9 +- .../projects-page/projects-page.tsx | 10 +- .../src/components/projects-page/top-bar.tsx | 31 +- .../select-cloud-storage.tsx | 143 +++++++ .../src/components/storage/storage-form.tsx | 73 ++++ cvat-ui/src/components/storage/storage.tsx | 91 +++++ cvat-ui/src/components/storage/styles.scss | 10 + .../src/components/tasks-page/tasks-page.tsx | 4 +- cvat-ui/src/components/tasks-page/top-bar.tsx | 32 +- .../containers/actions-menu/actions-menu.tsx | 72 ++-- .../top-bar/annotation-menu.tsx | 80 ++-- .../src/containers/tasks-page/tasks-page.tsx | 2 +- cvat-ui/src/reducers/export-reducer.ts | 118 +++++- cvat-ui/src/reducers/import-backup-reducer.ts | 65 +++ cvat-ui/src/reducers/import-reducer.ts | 146 +++++-- cvat-ui/src/reducers/interfaces.ts | 83 +++- cvat-ui/src/reducers/notifications-reducer.ts | 64 ++- cvat-ui/src/reducers/projects-reducer.ts | 6 +- cvat-ui/src/reducers/root-reducer.ts | 2 + cvat/apps/engine/backup.py | 2 +- cvat/apps/engine/views.py | 2 +- 53 files changed, 2882 insertions(+), 785 deletions(-) create mode 100644 cvat-core/src/storage.ts create mode 100644 cvat-ui/src/actions/import-backup-actions.ts create mode 100644 cvat-ui/src/components/export-backup/export-backup-modal.tsx create mode 100644 cvat-ui/src/components/export-backup/styles.scss create mode 100644 cvat-ui/src/components/import-backup/import-backup-modal.tsx rename cvat-ui/src/components/{import-dataset-modal => import-backup}/styles.scss (100%) delete mode 100644 cvat-ui/src/components/import-dataset-modal/import-dataset-modal.tsx create mode 100644 cvat-ui/src/components/import-dataset/import-dataset-modal.tsx rename cvat-ui/src/components/{import-dataset-modal => import-dataset}/import-dataset-status-modal.tsx (100%) create mode 100644 cvat-ui/src/components/import-dataset/styles.scss create mode 100644 cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx create mode 100644 cvat-ui/src/components/storage/storage-form.tsx create mode 100644 cvat-ui/src/components/storage/storage.tsx create mode 100644 cvat-ui/src/components/storage/styles.scss create mode 100644 cvat-ui/src/reducers/import-backup-reducer.ts diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index eb79fe448d6..89e66f06885 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -258,7 +258,7 @@ ); } - async function exportDataset(instance, format, name, saveImages = false) { + async function exportDataset(instance, format, name, saveImages = false, targetStorage = null) { if (!(format instanceof String || typeof format === 'string')) { throw new ArgumentError('Format must be a string'); } @@ -271,17 +271,18 @@ let result = null; if (instance instanceof Task) { - result = await serverProxy.tasks.exportDataset(instance.id, format, name, saveImages); + result = await serverProxy.tasks.exportDataset(instance.id, format, name, saveImages, targetStorage); } else if (instance instanceof Job) { - result = await serverProxy.tasks.exportDataset(instance.taskId, format, name, saveImages); + // TODO need to check. Was serverProxy.tasks.exportDataset(instance.taskId... + result = await serverProxy.jobs.exportDataset(instance.id, format, name, saveImages, targetStorage); } else { - result = await serverProxy.projects.exportDataset(instance.id, format, name, saveImages); + result = await serverProxy.projects.exportDataset(instance.id, format, name, saveImages, targetStorage); } return result; } - function importDataset(instance, format, file, updateStatusCallback = () => {}) { + function importDataset(instance, format, useDefaultSettings, sourceStorage, file = null, fileName = null, updateStatusCallback = () => {}) { if (!(typeof format === 'string')) { throw new ArgumentError('Format must be a string'); } @@ -291,10 +292,10 @@ if (!(typeof updateStatusCallback === 'function')) { throw new ArgumentError('Callback should be a function'); } - if (!(['application/zip', 'application/x-zip-compressed'].includes(file.type))) { + if (!((fileName || file.name).endsWith('.zip'))) { throw new ArgumentError('File should be file instance with ZIP extension'); } - return serverProxy.projects.importDataset(instance.id, format, file, updateStatusCallback); + return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, fileName, updateStatusCallback); } function getHistory(session) { diff --git a/cvat-core/src/enums.ts b/cvat-core/src/enums.ts index 2be9bfa9567..9f53d778071 100644 --- a/cvat-core/src/enums.ts +++ b/cvat-core/src/enums.ts @@ -426,6 +426,20 @@ RANDOM: 'random', }); + /** + * Types of storage locations + * @enum {string} + * @name StorageLocation + * @memberof module:API.cvat.enums + * @property {string} LOCAL 'local' + * @property {string} CLOUD_STORAGE 'cloud_storage' + * @readonly + */ + const StorageLocation = Object.freeze({ + LOCAL: 'local', + CLOUD_STORAGE: 'cloud_storage', + }); + module.exports = { ShareFileType, TaskStatus, @@ -446,5 +460,6 @@ CloudStorageCredentialsType, MembershipRole, SortingMethod, + StorageLocation, }; })(); diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index fb6445dc88e..666f6fbf442 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -7,6 +7,7 @@ const { getPreview } = require('./frames'); const { Project } = require('./project'); + const { Storage } = require('./storage'); const { exportDataset, importDataset } = require('./annotations'); function implementProject(projectClass) { @@ -30,7 +31,7 @@ } // initial creating - const projectSpec = { + const projectSpec: any = { name: this.name, labels: this.labels.map((el) => el.toJSON()), }; @@ -43,6 +44,14 @@ projectSpec.training_project = this.trainingProject; } + if (this.targetStorage) { + projectSpec.target_storage = this.targetStorage; + } + + if (this.sourceStorage) { + projectSpec.source_storage = this.sourceStorage; + } + const project = await serverProxy.projects.create(projectSpec); return new Project(project); }; @@ -64,26 +73,30 @@ format, saveImages, customName, + targetStorage ) { - const result = exportDataset(this, format, customName, saveImages); + const result = exportDataset(this, format, customName, saveImages, targetStorage); return result; }; projectClass.prototype.annotations.importDataset.implementation = async function ( format, + useDefaultSettings, + sourceStorage, file, - updateStatusCallback, + fileName, + updateStatusCallback ) { - return importDataset(this, format, file, updateStatusCallback); + return importDataset(this, format, useDefaultSettings, sourceStorage, file, fileName, updateStatusCallback); }; - projectClass.prototype.backup.implementation = async function () { - const result = await serverProxy.projects.backupProject(this.id); + projectClass.prototype.export.implementation = async function (fileName: string, targetStorage: Storage | null) { + const result = await serverProxy.projects.export(this.id, fileName, targetStorage); return result; }; - projectClass.restore.implementation = async function (file) { - const result = await serverProxy.projects.restoreProject(file); - return result.id; + projectClass.import.implementation = async function (storage, file, fileName) { + const result = await serverProxy.projects.import(storage, file, fileName); + return result; }; return projectClass; diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index 94214d58790..f8bb3afe8aa 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -8,6 +8,7 @@ const { Label } = require('./labels'); const User = require('./user'); const { FieldUpdateTrigger } = require('./common'); + const { Storage } = require('./storage'); /** * Class representing a project @@ -35,6 +36,9 @@ training_project: undefined, task_ids: undefined, dimension: undefined, + source_storage: undefined, + target_storage: undefined, + labels: undefined, }; const updateTrigger = new FieldUpdateTrigger(); @@ -241,6 +245,40 @@ updateTrigger.update('trainingProject'); }, }, + /** + * Source storage for import resources. + * @name sourceStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Project + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + sourceStorage: { + get: () => data.source_storage, + set: (sourceStorage) => { + if (typeof sourceStorage !== Storage) { + throw new ArgumentError('Type of value must be Storage'); + } + data.source_storage = sourceStorage; + }, + }, + /** + * Target storage for export resources. + * @name targetStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Project + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + targetStorage: { + get: () => data.target_storage, + set: (targetStorage) => { + if (typeof targetStorage !== Storage) { + throw new ArgumentError('Type of value must be Storage'); + } + data.target_storage = targetStorage; + }, + }, _internalData: { get: () => data, }, @@ -317,14 +355,19 @@ * @throws {module:API.cvat.exceptions.PluginError} * @returns {string} URL to get result archive */ - async backup() { - const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.backup); + async export(fileName: string, targetStorage: Storage | null) { + const result = await PluginRegistry.apiWrapper.call( + this, + Project.prototype.export, + fileName, + targetStorage + ); return result; } /** * Method restores a project from a backup - * @method restore + * @method import * @memberof module:API.cvat.classes.Project * @readonly * @instance @@ -333,8 +376,8 @@ * @throws {module:API.cvat.exceptions.PluginError} * @returns {number} ID of the imported project */ - static async restore(file) { - const result = await PluginRegistry.apiWrapper.call(this, Project.restore, file); + static async import(storage, file, fileName) { + const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file, fileName); return result; } } @@ -344,23 +387,27 @@ Object.freeze({ annotations: Object.freeze({ value: { - async exportDataset(format, saveImages, customName = '') { + async exportDataset(format, saveImages, customName = '', targetStorage = null) { const result = await PluginRegistry.apiWrapper.call( this, Project.prototype.annotations.exportDataset, format, saveImages, customName, + targetStorage ); return result; }, - async importDataset(format, file, updateStatusCallback = null) { + async importDataset(format, useDefaultSettings, sourceStorage, file = null, fileName = null, updateStatusCallback = null) { const result = await PluginRegistry.apiWrapper.call( this, Project.prototype.annotations.importDataset, format, + useDefaultSettings, + sourceStorage, file, - updateStatusCallback, + fileName, + updateStatusCallback ); return result; }, diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index bcc7e3add89..713659ecb8a 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -581,10 +581,10 @@ } function exportDataset(instanceType) { - return async function (id, format, name, saveImages) { + return async function (id, format, name, saveImages, targetStorage = null) { const { backendAPI } = config; const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; - const params = { + const params: any = { ...enableOrganization(), format, }; @@ -593,6 +593,14 @@ params.filename = name.replace(/\//g, '_'); } + params.use_default_location = !targetStorage.location; + if (!!targetStorage.location) { + params.location = targetStorage.location; + if (targetStorage.cloudStorageId) { + params.cloud_storage_id = targetStorage.cloudStorageId; + } + } + return new Promise((resolve, reject) => { async function request() { Axios.get(baseURL, { @@ -602,9 +610,16 @@ .then((response) => { if (response.status === 202) { setTimeout(request, 3000); - } else { + } else if (response.status === 201) { params.action = 'download'; - resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); + if (response.data['location'] === 'cloud_storage') { + setTimeout(request, 3000); + } + else { + resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); + } + } else { + resolve(); } }) .catch((errorData) => { @@ -617,38 +632,25 @@ }; } - async function importDataset(id, format, file, onUpdate) { + async function importDataset(id, format, useDefaultLocation, sourceStorage, file, fileName, onUpdate) { const { backendAPI, origin } = config; - const params = { + const params: any = { ...enableOrganization(), format, - filename: file.name, - }; - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/projects/${id}/dataset/`, - totalSentSize: 0, - totalSize: file.size, - onUpdate: (percentage) => { - onUpdate('The dataset is being uploaded to the server', percentage); - }, + filename: (file) ? file.name : fileName, }; + + params.use_default_location = useDefaultLocation; + if (!useDefaultLocation) { + params.location = sourceStorage.location; + if (sourceStorage.cloudStorageId) { + params.cloud_storage_id = sourceStorage.cloudStorageId; + } + } + const url = `${backendAPI}/projects/${id}/dataset`; - try { - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - await chunkUpload(file, uploadConfig); - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); + async function wait() { return new Promise((resolve, reject) => { async function requestStatus() { try { @@ -672,16 +674,64 @@ } setTimeout(requestStatus, 2000); }); - } catch (errorData) { - throw generateError(errorData); + } + + if (sourceStorage.location === 'cloud_storage') { + try { + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); + await wait(); + } catch (errorData) { + throw generateError(errorData); + } + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/projects/${id}/dataset/`, + totalSentSize: 0, + totalSize: file.size, + onUpdate: (percentage) => { + onUpdate('The dataset is being uploaded to the server', percentage); + }, + }; + + try { + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + await chunkUpload(file, uploadConfig); + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); + await wait(); + } catch (errorData) { + throw generateError(errorData); + } } } - async function exportTask(id) { + async function exportTask(id, fileName, targetStorage) { const { backendAPI } = config; - const params = { + const params: any = { ...enableOrganization(), + filename: fileName, + use_default_location: !targetStorage, }; + if (!!targetStorage) { + params.location = targetStorage.location; + if (targetStorage.cloudStorageId) { + params.cloud_storage_id = targetStorage.cloudStorageId; + } + } const url = `${backendAPI}/tasks/${id}/backup`; return new Promise((resolve, reject) => { @@ -693,9 +743,15 @@ }); if (response.status === 202) { setTimeout(request, 3000); - } else { + } else if (response.status === 201) { params.action = 'download'; - resolve(`${url}?${new URLSearchParams(params).toString()}`); + if (response.data['location'] === 'cloud_storage') { + setTimeout(request, 3000); + } else { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } + } else { + resolve(); } } catch (errorData) { reject(generateError(errorData)); @@ -706,62 +762,92 @@ }); } - async function importTask(file) { + async function importTask(storage, file, fileName) { + async function wait(taskData, response) { + return new Promise((resolve, reject) => { + async function checkStatus() { + try { + taskData.set('rq_id', response.data.rq_id); + response = await Axios.post(url, taskData, { + proxy: config.proxy, + params, + }); + if (response.status === 202) { + setTimeout(checkStatus, 3000); + } else { + // to be able to get the task after it was created, pass frozen params + const importedTask = await getTasks({ id: response.data.id, ...params }); + resolve(importedTask[0]); + } + } catch (errorData) { + reject(generateError(errorData)); + } + } + setTimeout(checkStatus); + }); + } + const { backendAPI } = config; // keep current default params to 'freeze" them during this request - const params = enableOrganization(); - - const taskData = new FormData(); - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/tasks/backup/`, - totalSentSize: 0, - totalSize: file.size, + const params: any = { + ...enableOrganization(), + location: storage.location, }; const url = `${backendAPI}/tasks/backup`; - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - const { filename } = await chunkUpload(file, uploadConfig); - let response = await Axios.post(url, - new FormData(), { - params: { ...params, filename }, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); + const taskData = new FormData(); + let response; - return new Promise((resolve, reject) => { - async function checkStatus() { - try { - taskData.set('rq_id', response.data.rq_id); - response = await Axios.post(url, taskData, { - proxy: config.proxy, - params, - }); - if (response.status === 202) { - setTimeout(checkStatus, 3000); - } else { - // to be able to get the task after it was created, pass frozen params - const importedTask = await getTasks({ id: response.data.id, ...params }); - resolve(importedTask[0]); - } - } catch (errorData) { - reject(generateError(errorData)); - } - } + if (storage.cloudStorageId) { + params.cloud_storage_id = storage.cloudStorageId; + } - setTimeout(checkStatus); - }); + if (storage.location === 'cloud_storage') { + params.filename = fileName; + response = await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/tasks/backup/`, + totalSentSize: 0, + totalSize: file.size, + }; + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + const { filename } = await chunkUpload(file, uploadConfig); + response = await Axios.post(url, + new FormData(), { + params: { ...params, filename }, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); + } + return await wait(taskData, response); } - async function backupProject(id) { + async function exportProject(id, fileName: string, targetStorage: Storage | null) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request - const params = enableOrganization(); + const params: any = { + ...enableOrganization(), + filename: fileName, + use_default_location: !targetStorage, + }; + + if (!!targetStorage) { + params.location = targetStorage.location; + if (targetStorage.cloudStorageId) { + params.cloud_storage_id = targetStorage.cloudStorageId; + } + } const url = `${backendAPI}/projects/${id}/backup`; return new Promise((resolve, reject) => { @@ -773,9 +859,15 @@ }); if (response.status === 202) { setTimeout(request, 3000); - } else { + } else if (response.status === 201) { params.action = 'download'; - resolve(`${url}?${new URLSearchParams(params).toString()}`); + if (response.data['location'] === 'cloud_storage') { + setTimeout(request, 3000); + } else { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } + } else { + resolve(); } } catch (errorData) { reject(generateError(errorData)); @@ -786,56 +878,76 @@ }); } - async function restoreProject(file) { - const { backendAPI } = config; - // keep current default params to 'freeze" them during this request - const params = enableOrganization(); + async function importProject(storage, file, fileName) { + async function wait(projectData, response) { + return new Promise((resolve, reject) => { + async function request() { + try { + projectData.set('rq_id', response.data.rq_id); + response = await Axios.post(`${backendAPI}/projects/backup`, projectData, { + proxy: config.proxy, + params, + }); + if (response.status === 202) { + setTimeout(request, 3000); + } else { + // to be able to get the task after it was created, pass frozen params + const restoredProject = await getProjects({ id: response.data.id, ...params }); + resolve(restoredProject[0]); + } + } catch (errorData) { + reject(generateError(errorData)); + } + } - const projectData = new FormData(); - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/projects/backup/`, - totalSentSize: 0, - totalSize: file.size, + setTimeout(request); + }); }; + const { backendAPI } = config; + // keep current default params to 'freeze" them during this request + const params: any = { + ...enableOrganization(), + location: storage.location, + } + if (storage.cloudStorageId) { + params.cloud_storage_id = storage.cloudStorageId; + } + const url = `${backendAPI}/projects/backup`; - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - const { filename } = await chunkUpload(file, uploadConfig); - let response = await Axios.post(url, - new FormData(), { - params: { ...params, filename }, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); + const projectData = new FormData(); + let response; - return new Promise((resolve, reject) => { - async function request() { - try { - projectData.set('rq_id', response.data.rq_id); - response = await Axios.post(`${backendAPI}/projects/backup`, projectData, { - proxy: config.proxy, - params, - }); - if (response.status === 202) { - setTimeout(request, 3000); - } else { - // to be able to get the task after it was created, pass frozen params - const restoredProject = await getProjects({ id: response.data.id, ...params }); - resolve(restoredProject[0]); - } - } catch (errorData) { - reject(generateError(errorData)); + if (storage.location === 'cloud_storage') { + params.filename = fileName; + response = await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/projects/backup/`, + totalSentSize: 0, + totalSize: file.size, + }; + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + const { filename } = await chunkUpload(file, uploadConfig); + response = await Axios.post(url, + new FormData(), { + params: { ...params, filename }, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, } - } - - setTimeout(request); - }); + ); + } + return await wait(projectData, response); } async function createTask(taskSpec, taskDataSpec, onUpdate) { @@ -1907,8 +2019,8 @@ create: createProject, delete: deleteProject, exportDataset: exportDataset('projects'), - backupProject, - restoreProject, + export: exportProject, + import: importProject, importDataset, }), writable: false, @@ -1931,6 +2043,7 @@ value: Object.freeze({ get: getJobs, save: saveJob, + exportDataset: exportDataset('jobs'), }), writable: false, }, diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 8bcda669133..2c58023c2ce 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -25,6 +25,7 @@ const { Label } = require('./labels'); const User = require('./user'); const Issue = require('./issue'); + const { Storage } = require('./storage'); const { FieldUpdateTrigger, checkObjectType } = require('./common'); function buildDuplicatedAPI(prototype) { @@ -151,13 +152,14 @@ return result; }, - async exportDataset(format, saveImages, customName = '') { + async exportDataset(format, saveImages, customName = '', targetStorage = null) { const result = await PluginRegistry.apiWrapper.call( this, prototype.annotations.exportDataset, format, saveImages, customName, + targetStorage ); return result; }, @@ -1204,6 +1206,8 @@ dimension: undefined, cloud_storage_id: undefined, sorting_method: undefined, + source_storage: undefined, + target_storage: undefined, }; const updateTrigger = new FieldUpdateTrigger(); @@ -1748,6 +1752,40 @@ */ get: () => data.sorting_method, }, + /** + * Source storage for import resources. + * @name sourceStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + sourceStorage: { + get: () => data.source_storage, + set: (sourceStorage) => { + if (typeof sourceStorage !== Storage) { + throw new ArgumentError('Type of value must be Storage'); + } + data.source_storage = sourceStorage; + }, + }, + /** + * Target storage for export resources. + * @name targetStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + targetStorage: { + get: () => data.target_storage, + set: (targetStorage) => { + if (typeof targetStorage !== Storage) { + throw new ArgumentError('Type of value must be Storage'); + } + data.target_storage = targetStorage; + }, + }, _internalData: { get: () => data, }, @@ -1867,8 +1905,13 @@ * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - async export() { - const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.export); + async export(fileName: string, targetStorage: Storage | null) { + const result = await PluginRegistry.apiWrapper.call( + this, + Task.prototype.export, + fileName, + targetStorage + ); return result; } @@ -1882,8 +1925,8 @@ * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - static async import(file) { - const result = await PluginRegistry.apiWrapper.call(this, Task.import, file); + static async import(storage, file, fileName) { + const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file, fileName); return result; } } @@ -2194,8 +2237,8 @@ return result; }; - Job.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName) { - const result = await exportDataset(this, format, customName, saveImages); + Job.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName, targetStorage) { + const result = await exportDataset(this, format, customName, saveImages, targetStorage); return result; }; @@ -2300,7 +2343,7 @@ return new Task(data); } - const taskSpec = { + const taskSpec: any = { name: this.name, labels: this.labels.map((el) => el.toJSON()), }; @@ -2321,6 +2364,14 @@ taskSpec.subset = this.subset; } + if (this.targetStorage) { + taskSpec.target_storage = this.targetStorage; + } + + if (this.sourceStorage) { + taskSpec.source_storage = this.sourceStorage; + } + const taskDataSpec = { client_files: this.clientFiles, server_files: this.serverFiles, @@ -2359,14 +2410,14 @@ return result; }; - Task.prototype.export.implementation = async function () { - const result = await serverProxy.tasks.export(this.id); + Task.prototype.export.implementation = async function (fileName: string, targetStorage: Storage | null) { + const result = await serverProxy.tasks.export(this.id, fileName, targetStorage); return result; }; - Task.import.implementation = async function (file) { + Task.import.implementation = async function (storage, file, fileName) { // eslint-disable-next-line no-unsanitized/method - const result = await serverProxy.tasks.import(file); + const result = await serverProxy.tasks.import(storage, file, fileName); return result; }; @@ -2608,8 +2659,8 @@ return result; }; - Task.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName) { - const result = await exportDataset(this, format, customName, saveImages); + Task.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName, targetStorage) { + const result = await exportDataset(this, format, customName, saveImages, targetStorage); return result; }; diff --git a/cvat-core/src/storage.ts b/cvat-core/src/storage.ts new file mode 100644 index 00000000000..05cef5eab92 --- /dev/null +++ b/cvat-core/src/storage.ts @@ -0,0 +1,89 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + + +(() => { + const { ArgumentError } = require('./exceptions'); + const { StorageLocation } = require('./enums'); + + interface StorageI { + location: typeof StorageLocation, + cloud_storage_id?: number, + } + + /** + * Class representing a storage for import and export resources + * @memberof module:API.cvat.classes + * @hideconstructor + */ + class Storage { + location: typeof StorageLocation; + cloudStorageID: number; + constructor(initialData) { + const data = { + location: undefined, + cloud_storage_id: undefined, + }; + + for (const key in data) { + if (Object.prototype.hasOwnProperty.call(data, key)) { + if (Object.prototype.hasOwnProperty.call(initialData, key)) { + data[key] = initialData[key]; + } + } + } + + Object.defineProperties( + this, + Object.freeze({ + /** + * @name location + * @type {module:API.cvat.enums.StorageLocation} + * @memberof module:API.cvat.classes.Storage + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + location: { + get: () => data.location, + set: (key) => { + if (key !== undefined && !!StorageLocation[key]) { + data.location = StorageLocation[key]; + } else { + throw new ArgumentError('Value must be one of the StorageLocation keys'); + } + }, + }, + /** + * @name cloudStorageID + * @type {number} + * @memberof module:API.cvat.classes.Storage + * @instance + */ + cloudStorageID: { + get: () => data.cloud_storage_id, + set: (cloudStorageID) => { + data.cloud_storage_id = cloudStorageID; + }, + }, + }), + ); + } + + toJSON() { + const object: StorageI = { + location: this.location, + }; + + if (typeof this.cloudStorageID !== 'undefined') { + object.cloud_storage_id = this.cloudStorageID; + } + + return object; + } + } + + module.exports = { + Storage, + }; +})(); diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index d12aa37e763..94fca85fba5 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT import { ActionUnion, createAction, ThunkAction } from 'utils/redux'; +import { Storage } from 'reducers/interfaces'; export enum ExportActionTypes { OPEN_EXPORT_MODAL = 'OPEN_EXPORT_MODAL', @@ -10,16 +11,21 @@ export enum ExportActionTypes { EXPORT_DATASET = 'EXPORT_DATASET', EXPORT_DATASET_SUCCESS = 'EXPORT_DATASET_SUCCESS', EXPORT_DATASET_FAILED = 'EXPORT_DATASET_FAILED', + EXPORT_BACKUP = 'EXPORT_BACKUP', + EXPORT_BACKUP_SUCCESS = 'EXPORT_BACKUP_SUCCESS', + EXPORT_BACKUP_FAILED = 'EXPORT_BACKUP_FAILED', } export const exportActions = { - openExportModal: (instance: any) => createAction(ExportActionTypes.OPEN_EXPORT_MODAL, { instance }), + openExportModal: (instance: any, resource: 'dataset' | 'backup' | null) => ( + createAction(ExportActionTypes.OPEN_EXPORT_MODAL, { instance, resource }) + ), closeExportModal: () => createAction(ExportActionTypes.CLOSE_EXPORT_MODAL), exportDataset: (instance: any, format: string) => ( createAction(ExportActionTypes.EXPORT_DATASET, { instance, format }) ), - exportDatasetSuccess: (instance: any, format: string) => ( - createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, { instance, format }) + exportDatasetSuccess: (instance: any, format: string, isLocal: boolean) => ( + createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, { instance, format, isLocal }) ), exportDatasetFailed: (instance: any, format: string, error: any) => ( createAction(ExportActionTypes.EXPORT_DATASET_FAILED, { @@ -28,6 +34,15 @@ export const exportActions = { error, }) ), + exportBackup: (instanceId: number) => ( + createAction(ExportActionTypes.EXPORT_BACKUP, { instanceId }) + ), + exportBackupSuccess: (instanceId: number) => ( + createAction(ExportActionTypes.EXPORT_BACKUP_SUCCESS, { instanceId }) + ), + exportBackupFailed: (instanceId: number, error: any) => ( + createAction(ExportActionTypes.EXPORT_BACKUP_FAILED, { instanceId, error }) + ), }; export const exportDatasetAsync = ( @@ -35,18 +50,37 @@ export const exportDatasetAsync = ( format: string, name: string, saveImages: boolean, + targetStorage: Storage | null, ): ThunkAction => async (dispatch) => { dispatch(exportActions.exportDataset(instance, format)); try { - const url = await instance.annotations.exportDataset(format, saveImages, name); - const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; - downloadAnchor.href = url; - downloadAnchor.click(); - dispatch(exportActions.exportDatasetSuccess(instance, format)); + const result = await instance.annotations.exportDataset(format, saveImages, name, targetStorage); + if (result) { + const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; + downloadAnchor.href = result; + downloadAnchor.click(); + } + dispatch(exportActions.exportDatasetSuccess(instance, format, !!result)); } catch (error) { dispatch(exportActions.exportDatasetFailed(instance, format, error)); } }; +export const exportBackupAsync = (instance: any, fileName: string, targetStorage: Storage | null): ThunkAction => async (dispatch) => { + dispatch(exportActions.exportBackup(instance.id)); + + try { + const result = await instance.export(fileName, targetStorage); + if (result) { + const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; + downloadAnchor.href = result; + downloadAnchor.click(); + } + dispatch(exportActions.exportBackupSuccess(instance.id)); + } catch (error) { + dispatch(exportActions.exportBackupFailed(instance.id, error as Error)); + } +}; + export type ExportActions = ActionUnion; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index a12bb31be24..42cf44abfc8 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -5,6 +5,10 @@ import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; import { CombinedState } from 'reducers/interfaces'; import { getProjectsAsync } from './projects-actions'; +import { Storage } from 'reducers/interfaces'; +import getCore from 'cvat-core-wrapper'; + +const core = getCore(); export enum ImportActionTypes { OPEN_IMPORT_MODAL = 'OPEN_IMPORT_MODAL', @@ -12,17 +16,19 @@ export enum ImportActionTypes { IMPORT_DATASET = 'IMPORT_DATASET', IMPORT_DATASET_SUCCESS = 'IMPORT_DATASET_SUCCESS', IMPORT_DATASET_FAILED = 'IMPORT_DATASET_FAILED', - IMPORT_DATASET_UPDATE_STATUS = 'IMPORT_DATASET_UPDATE_STATUS', + IMPORT_UPDATE_STATUS = 'IMPORT_UPDATE_STATUS', } export const importActions = { - openImportModal: (instance: any) => createAction(ImportActionTypes.OPEN_IMPORT_MODAL, { instance }), - closeImportModal: () => createAction(ImportActionTypes.CLOSE_IMPORT_MODAL), - importDataset: (projectId: number) => ( - createAction(ImportActionTypes.IMPORT_DATASET, { id: projectId }) + openImportModal: (instance: any, instanceType: any, resource: 'dataset' | 'annotation') => + createAction(ImportActionTypes.OPEN_IMPORT_MODAL, { instance, instanceType, resource }), + closeImportModal: (instance: any) => + createAction(ImportActionTypes.CLOSE_IMPORT_MODAL, { instance }), + importDataset: (instance: any, format: string) => ( + createAction(ImportActionTypes.IMPORT_DATASET, { instance, format }) ), - importDatasetSuccess: () => ( - createAction(ImportActionTypes.IMPORT_DATASET_SUCCESS) + importDatasetSuccess: (instance: any) => ( + createAction(ImportActionTypes.IMPORT_DATASET_SUCCESS, { instance }) ), importDatasetFailed: (instance: any, error: any) => ( createAction(ImportActionTypes.IMPORT_DATASET_FAILED, { @@ -30,29 +36,89 @@ export const importActions = { error, }) ), - importDatasetUpdateStatus: (progress: number, status: string) => ( - createAction(ImportActionTypes.IMPORT_DATASET_UPDATE_STATUS, { progress, status }) + importUpdateStatus: (instance: any, progress: number, status: string) => ( + createAction(ImportActionTypes.IMPORT_UPDATE_STATUS, { instance, progress, status }) ), }; -export const importDatasetAsync = (instance: any, format: string, file: File): ThunkAction => ( +export const importDatasetAsync = (instance: any, format: string, useDefaultSettings: boolean, sourceStorage: Storage, file: File | null, fileName: string | null): ThunkAction => ( async (dispatch, getState) => { try { const state: CombinedState = getState(); - if (state.import.importingId !== null) { - throw Error('Only one importing of dataset allowed at the same time'); + // if (state.import.importingId !== null) { + // throw Error('Only one importing of annotation/dataset allowed at the same time'); + // } + // dispatch(importActions.importDataset(instance.id, format)); + if (instance instanceof core.classes.Project) { + // TODO change importingId + if (state.import.projects?.instance !== null) { + throw Error('Only one importing of annotation/dataset allowed at the same time'); + } + dispatch(importActions.importDataset(instance, format)); + await instance.annotations.importDataset(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( + dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) + )); + } else if (instance instanceof core.classes.Task) { + if (state.import.tasks?.instance !== null) { + throw Error('Only one importing of annotation/dataset allowed at the same time'); + } + dispatch(importActions.importDataset(instance, format)); + // await task.annotations.upload(file, loader); + await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( + dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) + )); + } else { // job + // if (state.tasks.activities.loads[job.taskId]) { + // throw Error('Annotations is being uploaded for the task'); + // } + // if (state.annotation.activities.loads[job.id]) { + // throw Error('Only one uploading of annotations for a job allowed at the same time'); + // } + // const frame = state.annotation.player.frame.number; + // await job.annotations.upload(file, loader); + + // await job.logger.log(LogType.uploadAnnotations, { + // ...(await jobInfoGenerator(job)), + // }); + + // await job.annotations.clear(true); + // await job.actions.clear(); + // const history = await job.actions.get(); + + // // One more update to escape some problems + // // in canvas when shape with the same + // // clientID has different type (polygon, rectangle) for example + // dispatch({ + // type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, + // payload: { + // job, + // states: [], + // history, + // }, + // }); + + // const states = await job.annotations.get(frame, showAllInterpolationTracks, filters); + + // setTimeout(() => { + // dispatch({ + // type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, + // payload: { + // history, + // job, + // states, + // }, + // }); + // }); } - dispatch(importActions.importDataset(instance.id)); - await instance.annotations.importDataset(format, file, (message: string, progress: number) => ( - dispatch(importActions.importDatasetUpdateStatus(Math.floor(progress * 100), message)) - )); } catch (error) { dispatch(importActions.importDatasetFailed(instance, error)); return; } - dispatch(importActions.importDatasetSuccess()); - dispatch(getProjectsAsync({ id: instance.id }, getState().projects.tasksGettingQuery)); + dispatch(importActions.importDatasetSuccess(instance)); + if (instance instanceof core.classes.Project) { + dispatch(getProjectsAsync({ id: instance.id }, getState().projects.tasksGettingQuery)); + } } ); diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts new file mode 100644 index 00000000000..cd1ea9ce379 --- /dev/null +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -0,0 +1,47 @@ +// Copyright (C) 2021-2022 Intel Corporation +// +// SPDX-License-Identifier: MIT + +import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; +import { CombinedState } from 'reducers/interfaces'; +import { getProjectsAsync } from './projects-actions'; +import { Storage } from 'reducers/interfaces'; +import getCore from 'cvat-core-wrapper'; + +const core = getCore(); + +export enum ImportBackupActionTypes { + OPEN_IMPORT_MODAL = 'OPEN_IMPORT_MODAL', + CLOSE_IMPORT_MODAL = 'CLOSE_IMPORT_MODAL', + IMPORT_BACKUP = 'IMPORT_BACKUP', + IMPORT_BACKUP_SUCCESS = 'IMPORT_BACKUP_SUCCESS', + IMPORT_BACKUP_FAILED = 'IMPORT_BACKUP_FAILED', +} + +export const importBackupActions = { + openImportModal: (instanceType: 'project' | 'task' | null) => ( + createAction(ImportBackupActionTypes.OPEN_IMPORT_MODAL, { instanceType }) + ), + closeImportModal: () => createAction(ImportBackupActionTypes.CLOSE_IMPORT_MODAL), + importBackup: () => createAction(ImportBackupActionTypes.IMPORT_BACKUP), + importBackupSuccess: (instance: any) => ( + createAction(ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS, { instance }) + ), + importBackupFailed: (error: any) => ( + createAction(ImportBackupActionTypes.IMPORT_BACKUP_FAILED, { error }) + ), +}; + +export const importBackupAsync = (instanceType: 'project' | 'task' | null, storage: any, file: File | null, fileName: string | null): ThunkAction => ( + async (dispatch) => { + dispatch(importBackupActions.importBackup()); + try { + const inctanceClass = (instanceType === 'task') ? core.classes.Task : core.classes.Project; + const instance = await inctanceClass.import(storage, file, fileName); + dispatch(importBackupActions.importBackupSuccess(instance)); + } catch (error) { + dispatch(importBackupActions.importBackupFailed(error)); + } +}); + +export type ImportBackupActions = ActionUnion; diff --git a/cvat-ui/src/actions/projects-actions.ts b/cvat-ui/src/actions/projects-actions.ts index 0af733cce40..6cbf3932c60 100644 --- a/cvat-ui/src/actions/projects-actions.ts +++ b/cvat-ui/src/actions/projects-actions.ts @@ -63,20 +63,20 @@ const projectActions = { deleteProjectFailed: (projectId: number, error: any) => ( createAction(ProjectsActionTypes.DELETE_PROJECT_FAILED, { projectId, error }) ), - backupProject: (projectId: number) => createAction(ProjectsActionTypes.BACKUP_PROJECT, { projectId }), - backupProjectSuccess: (projectID: number) => ( - createAction(ProjectsActionTypes.BACKUP_PROJECT_SUCCESS, { projectID }) - ), - backupProjectFailed: (projectID: number, error: any) => ( - createAction(ProjectsActionTypes.BACKUP_PROJECT_FAILED, { projectId: projectID, error }) - ), - restoreProject: () => createAction(ProjectsActionTypes.RESTORE_PROJECT), - restoreProjectSuccess: (projectID: number) => ( - createAction(ProjectsActionTypes.RESTORE_PROJECT_SUCCESS, { projectID }) - ), - restoreProjectFailed: (error: any) => ( - createAction(ProjectsActionTypes.RESTORE_PROJECT_FAILED, { error }) - ), + // backupProject: (projectId: number) => createAction(ProjectsActionTypes.BACKUP_PROJECT, { projectId }), + // backupProjectSuccess: (projectID: number) => ( + // createAction(ProjectsActionTypes.BACKUP_PROJECT_SUCCESS, { projectID }) + // ), + // backupProjectFailed: (projectID: number, error: any) => ( + // createAction(ProjectsActionTypes.BACKUP_PROJECT_FAILED, { projectId: projectID, error }) + // ), + // restoreProject: () => createAction(ProjectsActionTypes.RESTORE_PROJECT), + // restoreProjectSuccess: (projectID: number) => ( + // createAction(ProjectsActionTypes.RESTORE_PROJECT_SUCCESS, { projectID }) + // ), + // restoreProjectFailed: (error: any) => ( + // createAction(ProjectsActionTypes.RESTORE_PROJECT_FAILED, { error }) + // ), }; export type ProjectActions = ActionUnion; @@ -189,30 +189,32 @@ export function deleteProjectAsync(projectInstance: any): ThunkAction { }; } -export function restoreProjectAsync(file: File): ThunkAction { - return async (dispatch: ActionCreator): Promise => { - dispatch(projectActions.restoreProject()); - try { - const projectInstance = await cvat.classes.Project.restore(file); - dispatch(projectActions.restoreProjectSuccess(projectInstance)); - } catch (error) { - dispatch(projectActions.restoreProjectFailed(error)); - } - }; -} - -export function backupProjectAsync(projectInstance: any): ThunkAction { - return async (dispatch: ActionCreator): Promise => { - dispatch(projectActions.backupProject(projectInstance.id)); - - try { - const url = await projectInstance.backup(); - const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; - downloadAnchor.href = url; - downloadAnchor.click(); - dispatch(projectActions.backupProjectSuccess(projectInstance.id)); - } catch (error) { - dispatch(projectActions.backupProjectFailed(projectInstance.id, error)); - } - }; -} +// export function restoreProjectAsync(storage: any, file: File | null, fileName: string | null): ThunkAction { +// return async (dispatch: ActionCreator): Promise => { +// dispatch(projectActions.restoreProject()); +// try { +// const projectInstance = await cvat.classes.Project.restore(storage, file, fileName); +// dispatch(projectActions.restoreProjectSuccess(projectInstance)); +// } catch (error) { +// dispatch(projectActions.restoreProjectFailed(error)); +// } +// }; +// } + +// export function backupProjectAsync(projectInstance: any): ThunkAction { +// return async (dispatch: ActionCreator): Promise => { +// dispatch(projectActions.backupProject(projectInstance.id)); + +// try { +// const result = await projectInstance.backup(); +// if (result) { +// const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; +// downloadAnchor.href = result; +// downloadAnchor.click(); +// } +// dispatch(projectActions.backupProjectSuccess(projectInstance.id)); +// } catch (error) { +// dispatch(projectActions.backupProjectFailed(projectInstance.id, error)); +// } +// }; +// } diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index 98ae49d2234..e7d2f612b10 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -7,6 +7,7 @@ import { ThunkAction } from 'redux-thunk'; import { TasksQuery, CombinedState, Indexable } from 'reducers/interfaces'; import { getCVATStore } from 'cvat-store'; import getCore from 'cvat-core-wrapper'; + import { getInferenceStatusAsync } from './models-actions'; const cvat = getCore(); @@ -32,12 +33,12 @@ export enum TasksActionTypes { UPDATE_JOB_SUCCESS = 'UPDATE_JOB_SUCCESS', UPDATE_JOB_FAILED = 'UPDATE_JOB_FAILED', HIDE_EMPTY_TASKS = 'HIDE_EMPTY_TASKS', - EXPORT_TASK = 'EXPORT_TASK', - EXPORT_TASK_SUCCESS = 'EXPORT_TASK_SUCCESS', - EXPORT_TASK_FAILED = 'EXPORT_TASK_FAILED', - IMPORT_TASK = 'IMPORT_TASK', - IMPORT_TASK_SUCCESS = 'IMPORT_TASK_SUCCESS', - IMPORT_TASK_FAILED = 'IMPORT_TASK_FAILED', + // EXPORT_TASK = 'EXPORT_TASK', + // EXPORT_TASK_SUCCESS = 'EXPORT_TASK_SUCCESS', + // EXPORT_TASK_FAILED = 'EXPORT_TASK_FAILED', + // IMPORT_TASK = 'IMPORT_TASK', + // IMPORT_TASK_SUCCESS = 'IMPORT_TASK_SUCCESS', + // IMPORT_TASK_FAILED = 'IMPORT_TASK_FAILED', SWITCH_MOVE_TASK_MODAL_VISIBLE = 'SWITCH_MOVE_TASK_MODAL_VISIBLE', } @@ -161,98 +162,98 @@ export function loadAnnotationsAsync( }; } -function importTask(): AnyAction { - const action = { - type: TasksActionTypes.IMPORT_TASK, - payload: {}, - }; - - return action; -} - -function importTaskSuccess(task: any): AnyAction { - const action = { - type: TasksActionTypes.IMPORT_TASK_SUCCESS, - payload: { - task, - }, - }; - - return action; -} - -function importTaskFailed(error: any): AnyAction { - const action = { - type: TasksActionTypes.IMPORT_TASK_FAILED, - payload: { - error, - }, - }; - - return action; -} - -export function importTaskAsync(file: File): ThunkAction, {}, {}, AnyAction> { - return async (dispatch: ActionCreator): Promise => { - try { - dispatch(importTask()); - const taskInstance = await cvat.classes.Task.import(file); - dispatch(importTaskSuccess(taskInstance)); - } catch (error) { - dispatch(importTaskFailed(error)); - } - }; -} - -function exportTask(taskID: number): AnyAction { - const action = { - type: TasksActionTypes.EXPORT_TASK, - payload: { - taskID, - }, - }; - - return action; -} - -function exportTaskSuccess(taskID: number): AnyAction { - const action = { - type: TasksActionTypes.EXPORT_TASK_SUCCESS, - payload: { - taskID, - }, - }; - - return action; -} - -function exportTaskFailed(taskID: number, error: Error): AnyAction { - const action = { - type: TasksActionTypes.EXPORT_TASK_FAILED, - payload: { - taskID, - error, - }, - }; - - return action; -} - -export function exportTaskAsync(taskInstance: any): ThunkAction, {}, {}, AnyAction> { - return async (dispatch: ActionCreator): Promise => { - dispatch(exportTask(taskInstance.id)); - - try { - const url = await taskInstance.export(); - const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; - downloadAnchor.href = url; - downloadAnchor.click(); - dispatch(exportTaskSuccess(taskInstance.id)); - } catch (error) { - dispatch(exportTaskFailed(taskInstance.id, error as Error)); - } - }; -} +// function importTask(): AnyAction { +// const action = { +// type: TasksActionTypes.IMPORT_TASK, +// payload: {}, +// }; + +// return action; +// } + +// function importTaskSuccess(task: any): AnyAction { +// const action = { +// type: TasksActionTypes.IMPORT_TASK_SUCCESS, +// payload: { +// task, +// }, +// }; + +// return action; +// } + +// function importTaskFailed(error: any): AnyAction { +// const action = { +// type: TasksActionTypes.IMPORT_TASK_FAILED, +// payload: { +// error, +// }, +// }; + +// return action; +// } + +// export function importTaskAsync(storage: any, file: File | null, fileName: string | null): ThunkAction, {}, {}, AnyAction> { +// return async (dispatch: ActionCreator): Promise => { +// try { +// dispatch(importTask()); +// const taskInstance = await cvat.classes.Task.import(storage, file, fileName); +// dispatch(importTaskSuccess(taskInstance)); +// } catch (error) { +// dispatch(importTaskFailed(error)); +// } +// }; +// } + +// function exportTask(taskID: number): AnyAction { +// const action = { +// type: TasksActionTypes.EXPORT_TASK, +// payload: { +// taskID, +// }, +// }; + +// return action; +// } + +// function exportTaskSuccess(taskID: number): AnyAction { +// const action = { +// type: TasksActionTypes.EXPORT_TASK_SUCCESS, +// payload: { +// taskID, +// }, +// }; + +// return action; +// } + +// function exportTaskFailed(taskID: number, error: Error): AnyAction { +// const action = { +// type: TasksActionTypes.EXPORT_TASK_FAILED, +// payload: { +// taskID, +// error, +// }, +// }; + +// return action; +// } + +// export function exportTaskAsync(taskInstance: any): ThunkAction, {}, {}, AnyAction> { +// return async (dispatch: ActionCreator): Promise => { +// dispatch(exportTask(taskInstance.id)); + +// try { +// const url = await taskInstance.export(); +// const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; +// downloadAnchor.href = url; +// downloadAnchor.click(); +// dispatch(exportTaskSuccess(taskInstance.id)); +// } catch (error) { +// dispatch(exportTaskFailed(taskInstance.id, error as Error)); +// } +// }; +// } function deleteTask(taskID: number): AnyAction { const action = { @@ -353,6 +354,15 @@ export function createTaskAsync(data: any): ThunkAction, {}, {}, A use_zip_chunks: data.advanced.useZipChunks, use_cache: data.advanced.useCache, sorting_method: data.advanced.sortingMethod, + // TODO: maybe need to move it to optional block + source_storage: { + location: data.advanced.sourceStorage.location, + cloud_storage_id: data.advanced.sourceStorage.cloudStorageId, + }, + target_storage: { + location: data.advanced.targetStorage.location, + cloud_storage_id: data.advanced.targetStorage.cloudStorageId, + }, }; if (data.projectId) { diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx index 20fb7acfe38..77aeb3232fa 100644 --- a/cvat-ui/src/components/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/components/actions-menu/actions-menu.tsx @@ -23,8 +23,8 @@ interface Props { inferenceIsActive: boolean; taskDimension: DimensionType; onClickMenu: (params: MenuInfo) => void; - onUploadAnnotations: (format: string, file: File) => void; - exportIsActive: boolean; + // onUploadAnnotations: (format: string, file: File) => void; + // exportIsActive: boolean; } export enum Actions { @@ -35,6 +35,7 @@ export enum Actions { MOVE_TASK_TO_PROJECT = 'move_task_to_project', OPEN_BUG_TRACKER = 'open_bug_tracker', EXPORT_TASK = 'export_task', + IMPORT_TASK = 'import_task', } function ActionsMenuComponent(props: Props): JSX.Element { @@ -44,10 +45,10 @@ function ActionsMenuComponent(props: Props): JSX.Element { inferenceIsActive, loaders, onClickMenu, - onUploadAnnotations, + // onUploadAnnotations, loadActivity, taskDimension, - exportIsActive, + // exportIsActive, } = props; const onClickMenuWrapper = useCallback( @@ -79,7 +80,7 @@ function ActionsMenuComponent(props: Props): JSX.Element { return ( - {LoadSubmenu({ + {/* {LoadSubmenu({ loaders, loadActivity, onFileUpload: (format: string, file: File): void => { @@ -101,7 +102,8 @@ function ActionsMenuComponent(props: Props): JSX.Element { }, menuKey: Actions.LOAD_TASK_ANNO, taskDimension, - })} + })} */} + Upload annotations Export task dataset {!!bugTracker && Open bug tracker} @@ -109,8 +111,8 @@ function ActionsMenuComponent(props: Props): JSX.Element { } + // disabled={exportIsActive} + // icon={exportIsActive && } > Backup Task diff --git a/cvat-ui/src/components/actions-menu/load-submenu.tsx b/cvat-ui/src/components/actions-menu/load-submenu.tsx index 801ed15f9bb..b12c1d11928 100644 --- a/cvat-ui/src/components/actions-menu/load-submenu.tsx +++ b/cvat-ui/src/components/actions-menu/load-submenu.tsx @@ -23,6 +23,7 @@ export default function LoadSubmenu(props: Props): JSX.Element { menuKey, loaders, loadActivity, onFileUpload, taskDimension, } = props; + // TODO update it return ( {loaders diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx index 6093a76bc1a..801db2476bf 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx @@ -24,12 +24,12 @@ const core = getCore(); interface Props { taskMode: string; - loaders: any[]; - dumpers: any[]; - loadActivity: string | null; + // loaders: any[]; + // dumpers: any[]; + // loadActivity: string | null; jobInstance: any; onClickMenu(params: MenuInfo): void; - onUploadAnnotations(format: string, file: File): void; + // onUploadAnnotations(format: string, file: File): void; stopFrame: number; removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly:boolean): void; setForceExitAnnotationFlag(forceExit: boolean): void; @@ -47,13 +47,13 @@ export enum Actions { function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Element { const { - loaders, - loadActivity, + // loaders, + // loadActivity, jobInstance, stopFrame, history, onClickMenu, - onUploadAnnotations, + // onUploadAnnotations, removeAnnotations, setForceExitAnnotationFlag, saveAnnotations, @@ -192,7 +192,7 @@ function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Elemen return ( onClickMenuWrapper(params)} className='cvat-annotation-menu' selectable={false}> - {LoadSubmenu({ + {/* {LoadSubmenu({ loaders, loadActivity, onFileUpload: (format: string, file: File): void => { @@ -214,7 +214,8 @@ function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Elemen }, menuKey: Actions.LOAD_JOB_ANNO, taskDimension: jobInstance.dimension, - })} + })} */} + Upload annotations Export task dataset Remove annotations diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index a119f7ed42e..52966ee4f54 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -12,6 +12,7 @@ import Select from 'antd/lib/select'; import { Col, Row } from 'antd/lib/grid'; import Text from 'antd/lib/typography/Text'; import Form, { FormInstance } from 'antd/lib/form'; +import Collapse from 'antd/lib/collapse'; import Button from 'antd/lib/button'; import Input from 'antd/lib/input'; import notification from 'antd/lib/notification'; @@ -21,6 +22,11 @@ import { CombinedState } from 'reducers/interfaces'; import LabelsEditor from 'components/labels-editor/labels-editor'; import { createProjectAsync } from 'actions/projects-actions'; import CreateProjectContext from './create-project.context'; +import { StorageLocation, StorageState } from 'reducers/interfaces'; +import CVATTooltip from 'components/common/cvat-tooltip'; +import StorageField from 'components/storage/storage'; +import StorageForm from 'components/storage/storage-form'; +import Space from 'antd/lib/space'; const { Option } = Select; @@ -97,8 +103,15 @@ function AdaptiveAutoAnnotationForm({ formRef }: { formRef: RefObject }): JSX.Element { - return ( +interface AdvancedConfigurationFormProps { + formRef: RefObject; + sourceStorageFormRef: RefObject; + targetStorageFormRef: RefObject; +} + +function AdvancedConfigurationForm(props: AdvancedConfigurationFormProps): JSX.Element { + const { formRef, sourceStorageFormRef, targetStorageFormRef } = props; + return (
+ + + console.log(value)} + /> + + + console.log(value)} + /> + +
); } @@ -129,6 +162,8 @@ export default function CreateProjectContent(): JSX.Element { const nameFormRef = useRef(null); const adaptiveAutoAnnotationFormRef = useRef(null); const advancedFormRef = useRef(null); + const sourceStorageFormRef = useRef(null); + const targetStorageFormRef = useRef(null); const dispatch = useDispatch(); const history = useHistory(); @@ -143,6 +178,8 @@ export default function CreateProjectContent(): JSX.Element { // Clear new project forms if (nameFormRef.current) nameFormRef.current.resetFields(); if (advancedFormRef.current) advancedFormRef.current.resetFields(); + sourceStorageFormRef.current?.resetFields(); + targetStorageFormRef.current?.resetFields(); setProjectLabels([]); notification.info({ @@ -160,11 +197,25 @@ export default function CreateProjectContent(): JSX.Element { if (nameFormRef.current && advancedFormRef.current) { const basicValues = await nameFormRef.current.validateFields(); const advancedValues = await advancedFormRef.current.validateFields(); + const sourceStorageValues = await sourceStorageFormRef.current?.validateFields(); + const targetStorageValues = await targetStorageFormRef.current?.validateFields(); + + let sourceStorage = { + location: sourceStorageValues['location'] || StorageLocation.LOCAL, + cloud_storage_id: sourceStorageValues['cloudStorageId'] || null, + }; + let targetStorage = { + location: targetStorageValues['location'] ||StorageLocation.LOCAL, + cloud_storage_id: targetStorageValues['cloudStorageId'] || null, + }; + const adaptiveAutoAnnotationValues = await adaptiveAutoAnnotationFormRef.current?.validateFields(); projectData = { ...projectData, ...advancedValues, name: basicValues.name, + source_storage: sourceStorage, + target_storage: targetStorage, }; if (adaptiveAutoAnnotationValues) { @@ -199,7 +250,15 @@ export default function CreateProjectContent(): JSX.Element { /> - + + Advanced configuration}> + + + )} > diff --git a/cvat-ui/src/components/project-page/project-page.tsx b/cvat-ui/src/components/project-page/project-page.tsx index fa4ac6df3c9..f6c30fd4932 100644 --- a/cvat-ui/src/components/project-page/project-page.tsx +++ b/cvat-ui/src/components/project-page/project-page.tsx @@ -22,7 +22,7 @@ import { cancelInferenceAsync } from 'actions/models-actions'; import TaskItem from 'components/tasks-page/task-item'; import MoveTaskModal from 'components/move-task-modal/move-task-modal'; import ModelRunnerDialog from 'components/model-runner-modal/model-runner-dialog'; -import ImportDatasetModal from 'components/import-dataset-modal/import-dataset-modal'; +import ImportDatasetModal from 'components/import-dataset/import-dataset-modal'; import { SortingComponent, ResourceFilterHOC, defaultVisibility, updateHistoryFromQuery, } from 'components/resource-sorting-filtering'; @@ -241,7 +241,7 @@ export default function ProjectPageComponent(): JSX.Element { - + {/* */} ); } diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 358beba4ab0..78e5816e68f 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -9,7 +9,7 @@ import Menu from 'antd/lib/menu'; import { LoadingOutlined } from '@ant-design/icons'; import { CombinedState } from 'reducers/interfaces'; -import { deleteProjectAsync, backupProjectAsync } from 'actions/projects-actions'; +import { deleteProjectAsync } from 'actions/projects-actions'; import { exportActions } from 'actions/export-actions'; import { importActions } from 'actions/import-actions'; @@ -17,6 +17,7 @@ interface Props { projectInstance: any; } +// TODO refactor export project backup export default function ProjectActionsMenuComponent(props: Props): JSX.Element { const { projectInstance } = props; @@ -42,15 +43,15 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { return ( - dispatch(exportActions.openExportModal(projectInstance))}> + dispatch(exportActions.openExportModal(projectInstance, 'dataset'))}> Export dataset - dispatch(importActions.openImportModal(projectInstance))}> + dispatch(importActions.openImportModal(projectInstance, 'project', 'dataset'))}> Import dataset dispatch(backupProjectAsync(projectInstance))} + onClick={() => dispatch(exportActions.openExportModal(projectInstance, 'backup'))} icon={exportIsActive && } > Backup Project diff --git a/cvat-ui/src/components/projects-page/projects-page.tsx b/cvat-ui/src/components/projects-page/projects-page.tsx index 793bcea81c9..e14c80e0178 100644 --- a/cvat-ui/src/components/projects-page/projects-page.tsx +++ b/cvat-ui/src/components/projects-page/projects-page.tsx @@ -9,10 +9,9 @@ import { useDispatch, useSelector } from 'react-redux'; import Spin from 'antd/lib/spin'; import { CombinedState, Indexable } from 'reducers/interfaces'; -import { getProjectsAsync, restoreProjectAsync } from 'actions/projects-actions'; +import { getProjectsAsync } from 'actions/projects-actions'; import FeedbackComponent from 'components/feedback/feedback'; import { updateHistoryFromQuery } from 'components/resource-sorting-filtering'; -import ImportDatasetModal from 'components/import-dataset-modal/import-dataset-modal'; import EmptyListComponent from './empty-list'; import TopBarComponent from './top-bar'; import ProjectListComponent from './project-list'; @@ -24,7 +23,7 @@ export default function ProjectsPageComponent(): JSX.Element { const count = useSelector((state: CombinedState) => state.projects.current.length); const query = useSelector((state: CombinedState) => state.projects.gettingQuery); const tasksQuery = useSelector((state: CombinedState) => state.projects.tasksGettingQuery); - const importing = useSelector((state: CombinedState) => state.projects.restoring); + const importing = useSelector((state: CombinedState) => state.importBackup.isProjectImported); const [isMounted, setIsMounted] = useState(false); const anySearch = Object.keys(query).some((value: string) => value !== 'page' && (query as any)[value] !== null); @@ -83,7 +82,8 @@ export default function ProjectsPageComponent(): JSX.Element { ); }} query={updatedQuery} - onImportProject={(file: File) => dispatch(restoreProjectAsync(file))} + // TODO + // onImportProject={(file: File) => dispatch(restoreProjectAsync(file))} importing={importing} /> { fetching ? ( @@ -92,7 +92,7 @@ export default function ProjectsPageComponent(): JSX.Element { ) : content } - + {/* */} ); } diff --git a/cvat-ui/src/components/projects-page/top-bar.tsx b/cvat-ui/src/components/projects-page/top-bar.tsx index d0b8edd85bd..8f8467e3136 100644 --- a/cvat-ui/src/components/projects-page/top-bar.tsx +++ b/cvat-ui/src/components/projects-page/top-bar.tsx @@ -19,12 +19,15 @@ import { localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, config, } from './projects-filter-configuration'; +import { importBackupActions } from 'actions/import-backup-actions'; +import { useDispatch } from 'react-redux'; + const FilteringComponent = ResourceFilterHOC( config, localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, ); interface Props { - onImportProject(file: File): void; + // onImportProject(file: File): void; onApplyFilter(filter: string | null): void; onApplySorting(sorting: string | null): void; onApplySearch(search: string | null): void; @@ -33,8 +36,9 @@ interface Props { } function TopBarComponent(props: Props): JSX.Element { + const dispatch = useDispatch(); const { - importing, query, onApplyFilter, onApplySorting, onApplySearch, onImportProject, + importing, query, onApplyFilter, onApplySorting, onApplySearch,// onImportProject, } = props; const [visibility, setVisibility] = useState(defaultVisibility); const prevImporting = usePrevious(importing); @@ -101,7 +105,7 @@ function TopBarComponent(props: Props): JSX.Element { > Create a new project - */} + - + Create from backup + {importing && } + + {/* */} )} > diff --git a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx new file mode 100644 index 00000000000..9b9a9b31bf5 --- /dev/null +++ b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx @@ -0,0 +1,143 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +// import './styles.scss'; +import React, { useEffect, useState } from 'react'; +import Form from 'antd/lib/form'; +import notification from 'antd/lib/notification'; +import AutoComplete from 'antd/lib/auto-complete'; +import Input from 'antd/lib/input'; +import { debounce } from 'lodash'; + +import Select from 'antd/lib/select'; +import getCore from 'cvat-core-wrapper'; +import { CloudStorage } from 'reducers/interfaces'; +import { AzureProvider, GoogleCloudProvider, S3Provider } from 'icons'; +import { ProviderType } from 'utils/enums'; + + +export interface Props { + searchPhrase: string; + cloudStorage: CloudStorage | null; + name?: string; + setSearchPhrase: (searchPhrase: string) => void; + onSelectCloudStorage: (cloudStorageId: number | null) => void; + +} +const { Option } = Select; + +async function searchCloudStorages(filter: Record): Promise { + try { + const data = await getCore().cloudStorages.get(filter); + return data; + } catch (error) { + notification.error({ + message: 'Could not fetch a list of cloud storages', + description: error.toString(), + }); + } + + return []; +} + +const searchCloudStoragesWrapper = debounce((phrase, setList) => { + const filter = { + filter: JSON.stringify({ + and: [{ + '==': [{ var: 'display_name' }, phrase], + }], + }), + }; + searchCloudStorages(filter).then((list) => { + setList(list); + }); +}, 500); + +function SelectCloudStorage(props: Props): JSX.Element { + const { searchPhrase, cloudStorage, name, setSearchPhrase, onSelectCloudStorage } = props; + const [initialList, setInitialList] = useState([]); + const [list, setList] = useState([]); + + useEffect(() => { + searchCloudStorages({}).then((data) => { + setInitialList(data); + if (!list.length) { + setList(data); + } + }); + }, []); + + useEffect(() => { + if (!searchPhrase) { + setList(initialList); + } else { + searchCloudStoragesWrapper(searchPhrase, setList); + } + }, [searchPhrase, initialList]); + + const onBlur = (): void => { + if (!searchPhrase && cloudStorage) { + onSelectCloudStorage(null); + } else if (searchPhrase) { + const potentialStorages = list.filter((_cloudStorage) => _cloudStorage.displayName.includes(searchPhrase)); + if (potentialStorages.length === 1) { + const potentialStorage = potentialStorages[0]; + setSearchPhrase(potentialStorage.displayName); + // eslint-disable-next-line prefer-destructuring + potentialStorage.manifestPath = potentialStorage.manifests[0]; + onSelectCloudStorage(potentialStorage); + } + } + }; + + + return ( + + { + setSearchPhrase(phrase); + }} + options={list.map((_cloudStorage) => ({ + value: _cloudStorage.id.toString(), + label: ( + + {_cloudStorage.providerType === ProviderType.AWS_S3_BUCKET && } + {_cloudStorage.providerType === ProviderType.AZURE_CONTAINER && } + { + _cloudStorage.providerType === ProviderType.GOOGLE_CLOUD_STORAGE && + + } + {_cloudStorage.displayName} + + ), + }))} + onSelect={(value: string) => { + const selectedCloudStorage = + list.filter((_cloudStorage: CloudStorage) => _cloudStorage.id === +value)[0] || null; + // eslint-disable-next-line prefer-destructuring + selectedCloudStorage.manifestPath = selectedCloudStorage.manifests[0]; + onSelectCloudStorage(selectedCloudStorage); + setSearchPhrase(selectedCloudStorage?.displayName || ''); + }} + allowClear + > + + + + ); + +} + +export default React.memo(SelectCloudStorage); \ No newline at end of file diff --git a/cvat-ui/src/components/storage/storage-form.tsx b/cvat-ui/src/components/storage/storage-form.tsx new file mode 100644 index 00000000000..2fc55b0dc21 --- /dev/null +++ b/cvat-ui/src/components/storage/storage-form.tsx @@ -0,0 +1,73 @@ +// (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +import './styles.scss'; +import React, { RefObject, useState } from 'react'; +import Form, { FormInstance } from 'antd/lib/form'; + +import Text from 'antd/lib/typography/Text'; +import Space from 'antd/lib/space'; +import Switch from 'antd/lib/switch'; +import StorageField from './storage'; +import { Storage, StorageLocation } from 'reducers/interfaces'; +import Tooltip from 'antd/lib/tooltip'; +import { QuestionCircleOutlined } from '@ant-design/icons'; + + +export interface Props { + formRef: RefObject; + projectId: number | null; + storageLabel: string; + switchDescription?: string; + switchHelpMessage?: string; + storageDescription?: string; + useProjectStorage?: boolean | null; + onChangeStorage: (values: Storage) => void; + onChangeUseProjectStorage?: (value: boolean) => void; +} + +const initialValues: any = { + location: StorageLocation.LOCAL, + cloudStorageId: null, +}; + +export default function StorageForm(props: Props): JSX.Element { + const { formRef, projectId, switchDescription, switchHelpMessage, storageDescription, useProjectStorage, storageLabel, onChangeUseProjectStorage, onChangeStorage, + } = props; + + + return ( +
+ { !!projectId && + + + { + if (onChangeUseProjectStorage) { + onChangeUseProjectStorage(value) + } + }} + /> + + {switchDescription} + {(switchHelpMessage) ? + + : null} + } + + {(!projectId || !useProjectStorage) && } + + ); +} diff --git a/cvat-ui/src/components/storage/storage.tsx b/cvat-ui/src/components/storage/storage.tsx new file mode 100644 index 00000000000..e70f3f3b258 --- /dev/null +++ b/cvat-ui/src/components/storage/storage.tsx @@ -0,0 +1,91 @@ +// (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +import './styles.scss'; +import React, { useEffect, useState } from 'react'; +import { QuestionCircleFilled } from '@ant-design/icons'; +import Select from 'antd/lib/select'; +import Form from 'antd/lib/form'; + +import { CloudStorage } from 'reducers/interfaces'; +import CVATTooltip from 'components/common/cvat-tooltip'; +import { StorageLocation } from 'reducers/interfaces'; +import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; +import Space from 'antd/lib/space'; + +import { Storage } from 'reducers/interfaces'; + +const { Option } = Select; + +export interface Props { + label: string; + description: string; + onChangeStorage?: (value: Storage) => void; +} + +export default function StorageField(props: Props): JSX.Element { + const { label, description, onChangeStorage } = props; + const [locationValue, setLocationValue] = useState(StorageLocation.LOCAL); + const [cloudStorage, setCloudStorage] = useState(null); + const [potentialCloudStorage, setPotentialCloudStorage] = useState(''); + + function renderCloudStorageId(): JSX.Element { + return ( + { + setPotentialCloudStorage(cs); + }} + name='cloudStorageId' + onSelectCloudStorage={(_cloudStorage: CloudStorage | null) => setCloudStorage(_cloudStorage)} + /> + ); + } + + useEffect(() => { + if (locationValue === StorageLocation.LOCAL) { + setCloudStorage(null); + } + }, [locationValue]); + + useEffect(() => { + if (onChangeStorage) { + onChangeStorage({ + location: locationValue, + cloudStorageId: cloudStorage?.id, + } as Storage); + } + }, [cloudStorage, locationValue]); + + return ( + <> + + + {label} + + + + + + )} + > + + + {locationValue === StorageLocation.CLOUD_STORAGE && renderCloudStorageId()} + + ); +} diff --git a/cvat-ui/src/components/storage/styles.scss b/cvat-ui/src/components/storage/styles.scss new file mode 100644 index 00000000000..e450068e72d --- /dev/null +++ b/cvat-ui/src/components/storage/styles.scss @@ -0,0 +1,10 @@ +// Copyright (C) 2022 Intel Corporation +// +// SPDX-License-Identifier: MIT + +@import '../../base.scss'; + +.cvat-question-circle-filled-icon { + font-size: $grid-unit-size * 14; + opacity: 0.5; +} diff --git a/cvat-ui/src/components/tasks-page/tasks-page.tsx b/cvat-ui/src/components/tasks-page/tasks-page.tsx index 3aa1c15370b..b09ee204d5b 100644 --- a/cvat-ui/src/components/tasks-page/tasks-page.tsx +++ b/cvat-ui/src/components/tasks-page/tasks-page.tsx @@ -17,7 +17,7 @@ import { TasksQuery, Indexable } from 'reducers/interfaces'; import FeedbackComponent from 'components/feedback/feedback'; import { updateHistoryFromQuery } from 'components/resource-sorting-filtering'; import TaskListContainer from 'containers/tasks-page/tasks-list'; -import { getTasksAsync, hideEmptyTasks, importTaskAsync } from 'actions/tasks-actions'; +import { getTasksAsync, hideEmptyTasks } from 'actions/tasks-actions'; import TopBar from './top-bar'; import EmptyListComponent from './empty-list'; @@ -139,7 +139,7 @@ function TasksPageComponent(props: Props): JSX.Element { ); }} query={updatedQuery} - onImportTask={(file: File) => dispatch(importTaskAsync(file))} + //onImportTask={(file: File) => dispatch(importTaskAsync(file))} importing={importing} /> { fetching ? ( diff --git a/cvat-ui/src/components/tasks-page/top-bar.tsx b/cvat-ui/src/components/tasks-page/top-bar.tsx index 01b00e7f996..fcc3c2384de 100644 --- a/cvat-ui/src/components/tasks-page/top-bar.tsx +++ b/cvat-ui/src/components/tasks-page/top-bar.tsx @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT import React, { useState, useEffect } from 'react'; +import { useDispatch } from 'react-redux'; import { useHistory } from 'react-router'; import { Row, Col } from 'antd/lib/grid'; import Dropdown from 'antd/lib/dropdown'; @@ -18,12 +19,15 @@ import { localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, config, } from './tasks-filter-configuration'; +import { importActions } from 'actions/import-actions'; +import { importBackupActions } from 'actions/import-backup-actions'; const FilteringComponent = ResourceFilterHOC( config, localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, ); +// TODO update a task backup import interface VisibleTopBarProps { - onImportTask(file: File): void; + // onImportTask(file: File): void; onApplyFilter(filter: string | null): void; onApplySorting(sorting: string | null): void; onApplySearch(search: string | null): void; @@ -32,8 +36,9 @@ interface VisibleTopBarProps { } export default function TopBarComponent(props: VisibleTopBarProps): JSX.Element { + const dispatch = useDispatch(); const { - importing, query, onApplyFilter, onApplySorting, onApplySearch, onImportTask, + importing, query, onApplyFilter, onApplySorting, onApplySearch, // onImportTask, } = props; const [visibility, setVisibility] = useState(defaultVisibility); const history = useHistory(); @@ -99,7 +104,7 @@ export default function TopBarComponent(props: VisibleTopBarProps): JSX.Element > Create a new task - */} + - + Create from backup + {importing && } + + {/* */} )} > diff --git a/cvat-ui/src/containers/actions-menu/actions-menu.tsx b/cvat-ui/src/containers/actions-menu/actions-menu.tsx index 6e09bdf99c9..c0fc87a7310 100644 --- a/cvat-ui/src/containers/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/containers/actions-menu/actions-menu.tsx @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import React from 'react'; +import React, { useState } from 'react'; import { connect } from 'react-redux'; // eslint-disable-next-line import/no-extraneous-dependencies import { MenuInfo } from 'rc-menu/lib/interface'; @@ -14,10 +14,10 @@ import { modelsActions } from 'actions/models-actions'; import { loadAnnotationsAsync, deleteTaskAsync, - exportTaskAsync, switchMoveTaskModalVisible, } from 'actions/tasks-actions'; import { exportActions } from 'actions/export-actions'; +import { importActions } from 'actions/import-actions'; interface OwnProps { taskInstance: any; @@ -27,15 +27,17 @@ interface StateToProps { annotationFormats: any; loadActivity: string | null; inferenceIsActive: boolean; - exportIsActive: boolean; + // exportIsActive: boolean; } interface DispatchToProps { loadAnnotations: (taskInstance: any, loader: any, file: File) => void; - showExportModal: (taskInstance: any) => void; - deleteTask: (taskInstance: any) => void; + showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null) => void; + showImportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null) => void; + // showExportBackupModal: (taskInstance: any) => void; openRunModelWindow: (taskInstance: any) => void; - exportTask: (taskInstance: any) => void; + deleteTask: (taskInstance: any) => void; + // exportTask: (taskInstance: any) => void; openMoveTaskToProjectWindow: (taskInstance: any) => void; } @@ -47,7 +49,7 @@ function mapStateToProps(state: CombinedState, own: OwnProps): StateToProps { const { formats: { annotationFormats }, tasks: { - activities: { loads, backups }, + activities: { loads }, //backups }, } = state; @@ -55,7 +57,7 @@ function mapStateToProps(state: CombinedState, own: OwnProps): StateToProps { loadActivity: tid in loads ? loads[tid] : null, annotationFormats, inferenceIsActive: tid in state.models.inferences, - exportIsActive: tid in backups, + // exportIsActive: tid in backups, }; } @@ -64,18 +66,25 @@ function mapDispatchToProps(dispatch: any): DispatchToProps { loadAnnotations: (taskInstance: any, loader: any, file: File): void => { dispatch(loadAnnotationsAsync(taskInstance, loader, file)); }, - showExportModal: (taskInstance: any): void => { - dispatch(exportActions.openExportModal(taskInstance)); + showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null): void => { + dispatch(exportActions.openExportModal(taskInstance, resource)); + }, + showImportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null): void => { + dispatch(importActions.openImportModal(taskInstance, 'task', 'annotation')); }, deleteTask: (taskInstance: any): void => { dispatch(deleteTaskAsync(taskInstance)); }, + // showExportBackupModal: (taskInstance: any): void => { + // dispatch(exportBackupActions.openExportBackupModal(taskInstance)); + // }, openRunModelWindow: (taskInstance: any): void => { dispatch(modelsActions.showRunModelDialog(taskInstance)); }, - exportTask: (taskInstance: any): void => { - dispatch(exportTaskAsync(taskInstance)); - }, + // exportTask: (taskInstance: any): void => { + // // fixme + // // dispatch(exportTaskAsync(taskInstance)); + // }, openMoveTaskToProjectWindow: (taskId: number): void => { dispatch(switchMoveTaskModalVisible(true, taskId)); }, @@ -88,19 +97,23 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps): annotationFormats: { loaders, dumpers }, loadActivity, inferenceIsActive, - exportIsActive, - loadAnnotations, + // exportIsActive, + // loadAnnotations, showExportModal, + showImportModal, + //showExportBackupModal, deleteTask, openRunModelWindow, - exportTask, + // exportTask, openMoveTaskToProjectWindow, } = props; + // const [isExportDatasetModalOpen, setIsExportDatasetModalOpen] = useState(false); + // const [isExportBackupModalOpen, setIsExportBackupModalOpen] = useState(false); - function onClickMenu(params: MenuInfo): void { + function onClickMenu(params: MenuInfo): void | JSX.Element { const [action] = params.keyPath; if (action === Actions.EXPORT_TASK_DATASET) { - showExportModal(taskInstance); + showExportModal(taskInstance, 'dataset'); } else if (action === Actions.DELETE_TASK) { deleteTask(taskInstance); } else if (action === Actions.OPEN_BUG_TRACKER) { @@ -108,18 +121,23 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps): } else if (action === Actions.RUN_AUTO_ANNOTATION) { openRunModelWindow(taskInstance); } else if (action === Actions.EXPORT_TASK) { - exportTask(taskInstance); + showExportModal(taskInstance, 'backup'); + // exportTask(taskInstance); } else if (action === Actions.MOVE_TASK_TO_PROJECT) { openMoveTaskToProjectWindow(taskInstance.id); + } else if (action === Actions.LOAD_TASK_ANNO) { + showImportModal(taskInstance, 'dataset'); + } else if (action === Actions.IMPORT_TASK) { + showImportModal(taskInstance, 'backup'); } } - function onUploadAnnotations(format: string, file: File): void { - const [loader] = loaders.filter((_loader: any): boolean => _loader.name === format); - if (loader && file) { - loadAnnotations(taskInstance, loader, file); - } - } + // function onUploadAnnotations(format: string, file: File): void { + // const [loader] = loaders.filter((_loader: any): boolean => _loader.name === format); + // if (loader && file) { + // loadAnnotations(taskInstance, loader, file); + // } + // } return ( ); } diff --git a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx index df3d70c70e8..35cb2ef97c4 100644 --- a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx @@ -18,20 +18,22 @@ import { removeAnnotationsAsync as removeAnnotationsAsyncAction, } from 'actions/annotation-actions'; import { exportActions } from 'actions/export-actions'; +import { importActions } from 'actions/import-actions'; import getCore from 'cvat-core-wrapper'; const core = getCore(); interface StateToProps { - annotationFormats: any; + // annotationFormats: any; jobInstance: any; stopFrame: number; - loadActivity: string | null; + // loadActivity: string | null; } interface DispatchToProps { - loadAnnotations(job: any, loader: any, file: File): void; - showExportModal(jobInstance: any): void; + // loadAnnotations(job: any, loader: any, file: File): void; + showExportModal: (jobInstance: any, resource: 'dataset' | 'backup' | null) => void; + showImportModal: (jobInstance: any, resource: 'dataset' | 'backup' | null) => void; removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly: boolean): void; setForceExitAnnotationFlag(forceExit: boolean): void; saveAnnotations(jobInstance: any, afterSave?: () => void): void; @@ -41,36 +43,39 @@ interface DispatchToProps { function mapStateToProps(state: CombinedState): StateToProps { const { annotation: { - activities: { loads: jobLoads }, + // activities: { loads: jobLoads }, job: { instance: jobInstance, instance: { stopFrame }, }, }, - formats: { annotationFormats }, - tasks: { - activities: { loads }, - }, + // formats: { annotationFormats }, + // tasks: { + // activities: { loads }, + // }, } = state; - const taskID = jobInstance.taskId; - const jobID = jobInstance.id; + // const taskID = jobInstance.taskId; + // const jobID = jobInstance.id; return { - loadActivity: taskID in loads || jobID in jobLoads ? loads[taskID] || jobLoads[jobID] : null, + // loadActivity: taskID in loads || jobID in jobLoads ? loads[taskID] || jobLoads[jobID] : null, jobInstance, stopFrame, - annotationFormats, + // annotationFormats, }; } function mapDispatchToProps(dispatch: any): DispatchToProps { return { - loadAnnotations(job: any, loader: any, file: File): void { - dispatch(uploadJobAnnotationsAsync(job, loader, file)); + // loadAnnotations(job: any, loader: any, file: File): void { + // dispatch(uploadJobAnnotationsAsync(job, loader, file)); + // }, + showExportModal(taskInstance: any, resource: 'dataset' | 'backup' | null): void { + dispatch(exportActions.openExportModal(taskInstance, resource)); }, - showExportModal(jobInstance: any): void { - dispatch(exportActions.openExportModal(jobInstance)); + showImportModal(taskInstance: any, resource: 'dataset' | 'backup' | null): void { + dispatch(importActions.openImportModal(taskInstance, 'task', resource)); }, removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly:boolean) { dispatch(removeAnnotationsAsyncAction(startnumber, endnumber, delTrackKeyframesOnly)); @@ -93,28 +98,34 @@ function AnnotationMenuContainer(props: Props): JSX.Element { const { jobInstance, stopFrame, - annotationFormats: { loaders, dumpers }, + // annotationFormats: { loaders, dumpers }, history, - loadActivity, - loadAnnotations, + // loadActivity, + // loadAnnotations, showExportModal, + showImportModal, removeAnnotations, setForceExitAnnotationFlag, saveAnnotations, updateJob, } = props; - const onUploadAnnotations = (format: string, file: File): void => { - const [loader] = loaders.filter((_loader: any): boolean => _loader.name === format); - if (loader && file) { - loadAnnotations(jobInstance, loader, file); - } - }; + // const onUploadAnnotations = (format: string, file: File): void => { + // const [loader] = loaders.filter((_loader: any): boolean => _loader.name === format); + // if (loader && file) { + // loadAnnotations(jobInstance, loader, file); + // } + // }; const onClickMenu = (params: MenuInfo): void => { const [action] = params.keyPath; if (action === Actions.EXPORT_TASK_DATASET) { - showExportModal(jobInstance); + core.tasks.get({ id: jobInstance.taskId }).then((response: any) => { + if (response.length) { + const [taskInstance] = response; + showExportModal(taskInstance, 'dataset'); + } + }); } else if (action === Actions.RENEW_JOB) { jobInstance.state = core.enums.JobState.NEW; jobInstance.stage = JobStage.ANNOTATION; @@ -131,16 +142,23 @@ function AnnotationMenuContainer(props: Props): JSX.Element { [, jobInstance.state] = action.split(':'); updateJob(jobInstance); window.location.reload(); + } else if (action === Actions.LOAD_JOB_ANNO) { + core.tasks.get({ id: jobInstance.taskId }).then((response: any) => { + if (response.length) { + const [taskInstance] = response; + showImportModal(taskInstance, 'dataset'); + } + }); } }; return ( !task.instance.jobs.length).length : 0, - importing: state.tasks.importing, + importing: state.importBackup.isTaskImported, }; } diff --git a/cvat-ui/src/reducers/export-reducer.ts b/cvat-ui/src/reducers/export-reducer.ts index dab7c5cd356..939afc53cbf 100644 --- a/cvat-ui/src/reducers/export-reducer.ts +++ b/cvat-ui/src/reducers/export-reducer.ts @@ -5,6 +5,7 @@ import { ExportActions, ExportActionTypes } from 'actions/export-actions'; import getCore from 'cvat-core-wrapper'; import deepCopy from 'utils/deep-copy'; +import { omit } from 'lodash'; import { ExportState } from './interfaces'; @@ -13,6 +14,8 @@ const core = getCore(); const defaultState: ExportState = { tasks: {}, projects: {}, + jobs: {}, + resource: null, instance: null, modalVisible: false, }; @@ -24,43 +27,132 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor ...state, modalVisible: true, instance: action.payload.instance, + resource: action.payload.resource, }; case ExportActionTypes.CLOSE_EXPORT_MODAL: return { ...state, modalVisible: false, instance: null, + resource: null, }; case ExportActionTypes.EXPORT_DATASET: { const { instance, format } = action.payload; - const activities = deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); - const instanceId = instance instanceof core.classes.Project || - instance instanceof core.classes.Task ? instance.id : instance.taskId; + let activities; + let field; + if (instance instanceof core.classes.Project) { + activities = deepCopy(state.projects); + field = 'projects'; + } else if (instance instanceof core.classes.Task) { + activities = deepCopy(state.tasks); + field = 'tasks'; + } else { + activities = deepCopy(state.jobs); + field = 'jobs'; + } - activities[instanceId] = - instanceId in activities && !activities[instanceId].includes(format) ? - [...activities[instanceId], format] : - activities[instanceId] || [format]; + + // deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); + // const instanceId = instance instanceof core.classes.Project || + // instance instanceof core.classes.Task ? instance.id : instance.taskId; + const instanceId = instance.id; + + activities[instanceId].dataset = + instanceId in activities && !activities[instanceId].dataset.includes(format) ? + [...activities[instanceId].dataset, format] : + activities[instanceId].dataset || [format]; return { ...state, - ...(instance instanceof core.classes.Project ? { projects: activities } : { tasks: activities }), + ...{[field]: activities}, }; } case ExportActionTypes.EXPORT_DATASET_FAILED: case ExportActionTypes.EXPORT_DATASET_SUCCESS: { const { instance, format } = action.payload; - const activities = deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); - const instanceId = instance instanceof core.classes.Project || - instance instanceof core.classes.Task ? instance.id : instance.taskId; + let activities; + let field; + if (instance instanceof core.classes.Project) { + activities = deepCopy(state.projects); + field = 'projects'; + } else if (instance instanceof core.classes.Task) { + activities = deepCopy(state.tasks); + field = 'tasks'; + } else { + activities = deepCopy(state.jobs); + field = 'jobs'; + } + // switch (typeof instance) { + // case core.classes.Project: { + // activities = deepCopy(state.projects); + // field = 'projects'; + // break; + // } + // case core.classes.Task: { + // activities = deepCopy(state.tasks); + // field = 'tasks'; + // break; + // } + // case core.classes.Job: { + // activities = deepCopy(state.jobs); + // field = 'jobs'; + // break; + // } + // default: + // } + const instanceId = instance.id; - activities[instanceId] = activities[instanceId].filter( + // const activities = deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); + // const instanceId = instance instanceof core.classes.Project || + // instance instanceof core.classes.Task ? instance.id : instance.taskId; + + activities[instanceId].dataset = activities[instanceId].dataset.filter( (exporterName: string): boolean => exporterName !== format, ); return { ...state, - ...(instance instanceof core.classes.Project ? { projects: activities } : { tasks: activities }), + ...{[field]: activities}, + }; + } + case ExportActionTypes.EXPORT_TASK: { + const { taskId } = action.payload; + //const { backups } = state; + + return { + ...state, + tasks: { + ...state.tasks, + [taskId]: { + ...state.tasks[taskId], + 'backup': true, + } + + } + // : { + // ...backups, + // ...Object.fromEntries([[taskId, true]]), + // }, + }; + } + case ExportActionTypes.EXPORT_TASK_FAILED: + case ExportActionTypes.EXPORT_TASK_SUCCESS: { + const { taskId } = action.payload; + // const { backup } = state.tasks[taskId]; + + // delete backup; + + // TODO taskid maybe undefined? + return { + ...state, + tasks: { + ...state.tasks, + [taskId]: { + ...state.tasks[taskId], + 'backup': false, + } + } + // backups: omit(backups, [taskId]), }; } default: diff --git a/cvat-ui/src/reducers/import-backup-reducer.ts b/cvat-ui/src/reducers/import-backup-reducer.ts new file mode 100644 index 00000000000..94c9e216a02 --- /dev/null +++ b/cvat-ui/src/reducers/import-backup-reducer.ts @@ -0,0 +1,65 @@ +// Copyright (C) 2021-2022 Intel Corporation +// +// SPDX-License-Identifier: MIT + +import { ImportBackupActions, ImportBackupActionTypes } from 'actions/import-backup-actions'; + +import { ImportBackupState } from './interfaces'; + +import getCore from 'cvat-core-wrapper'; + +const core = getCore(); + +const defaultState: ImportBackupState = { + isTaskImported: false, + isProjectImported: false, + instanceType: null, + modalVisible: false, +}; + +export default (state: ImportBackupState = defaultState, action: ImportBackupActions): ImportBackupState => { + switch (action.type) { + case ImportBackupActionTypes.OPEN_IMPORT_MODAL: + return { + ...state, + modalVisible: true, + instanceType: action.payload.instanceType, + }; + case ImportBackupActionTypes.CLOSE_IMPORT_MODAL: { + return { + ...state, + modalVisible: false, + }; + } + // case ImportBackupActionTypes.IMPORT_UPDATE_STATUS: { + // const { progress, status } = action.payload; + // return { + // ...state, + // progress, + // status, + // }; + // } + case ImportBackupActionTypes.IMPORT_BACKUP: { + const { instanceType } = state; + const field = (instanceType === 'project') ? 'isProjectImported' : 'isTaskImported'; + + return { + ...state, + [field]: true, + }; + } + case ImportBackupActionTypes.IMPORT_BACKUP_FAILED: + case ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS: { + const { instanceType } = state; + const field = (instanceType === 'project') ? 'isProjectImported' : 'isTaskImported'; + + return { + ...state, + instanceType: null, + [field]: false, + }; + } + default: + return state; + } +}; diff --git a/cvat-ui/src/reducers/import-reducer.ts b/cvat-ui/src/reducers/import-reducer.ts index fe8b819d2f4..2b2b04b2de5 100644 --- a/cvat-ui/src/reducers/import-reducer.ts +++ b/cvat-ui/src/reducers/import-reducer.ts @@ -4,55 +4,155 @@ import { ImportActions, ImportActionTypes } from 'actions/import-actions'; -import { ImportState } from './interfaces'; - -const defaultState: ImportState = { - progress: 0.0, - status: '', - instance: null, - importingId: null, - modalVisible: false, +import { ImportDatasetState } from './interfaces'; + +import getCore from 'cvat-core-wrapper'; + +const core = getCore(); + +const defaultProgress = 0.0; +const defaultStatus = ''; + +function defineActititiesField(instance: any): 'projects' | 'tasks' | 'jobs' { + let field: 'projects' | 'tasks' | 'jobs'; + if (instance instanceof core.classes.Project) { + field = 'projects'; + } else if (instance instanceof core.classes.Task) { + field = 'tasks'; + } else { // job + field = 'jobs'; + } + return field; +} + +const defaultState: ImportDatasetState = { + // projects: {}, + // tasks: {}, + // jobs: {}, + //resource: null, + // progress: 0.0, + // status: '', + // instance: null, + // importingId: null, + // modalVisible: false, + projects: { + activities: {}, + importingId: null, + progress: defaultProgress, + status: defaultStatus, + instance: null, + modalVisible: false, + }, + tasks: { + activities: {}, + importingId: null, + progress: defaultProgress, + status: defaultStatus, + instance: null, + modalVisible: false, + }, + jobs: { + activities: {}, + importingId: null, + progress: defaultProgress, + status: defaultStatus, + instance: null, + modalVisible: false, + }, + instanceType: null, + resource: null, }; -export default (state: ImportState = defaultState, action: ImportActions): ImportState => { +export default (state: ImportDatasetState = defaultState, action: ImportActions): ImportDatasetState => { switch (action.type) { case ImportActionTypes.OPEN_IMPORT_MODAL: + const { instance, instanceType, resource } = action.payload; + const activitiesField = defineActititiesField(instance); + return { ...state, - modalVisible: true, - instance: action.payload.instance, + [activitiesField]: { + ...state[activitiesField], + modalVisible: true, + instance: instance, + }, + instanceType: instanceType, + resource: resource, }; case ImportActionTypes.CLOSE_IMPORT_MODAL: { + const { instance } = action.payload; + const activitiesField = defineActititiesField(instance); + return { ...state, - modalVisible: false, - instance: null, + [activitiesField]: { + ...state[activitiesField], + modalVisible: false, + instance: null, + }, + resource: null, }; } case ImportActionTypes.IMPORT_DATASET: { - const { id } = action.payload; + const { format, instance } = action.payload; + + const activitiesField = defineActititiesField(instance); + + const activities = state[activitiesField]?.activities; + activities[instance.id] = instance.id in activities ? activities[instance.id] : format; return { ...state, - importingId: id, - status: 'The file is being uploaded to the server', + [activitiesField]: { + activities: { + ...activities, + }, + status: 'The file is being uploaded to the server', + }, + //importingId: id, }; } - case ImportActionTypes.IMPORT_DATASET_UPDATE_STATUS: { - const { progress, status } = action.payload; + case ImportActionTypes.IMPORT_UPDATE_STATUS: { + const { progress, status, instance } = action.payload; + + const activitiesField = defineActititiesField(instance); return { ...state, - progress, - status, + [activitiesField]: { + ...state[activitiesField], + progress, + status, + } }; } case ImportActionTypes.IMPORT_DATASET_FAILED: case ImportActionTypes.IMPORT_DATASET_SUCCESS: { + const { instance } = action.payload; + + const activitiesField = defineActititiesField(instance); + const activities = state[activitiesField]?.activities; + delete activities[instance.id]; + return { ...state, - progress: defaultState.progress, - status: defaultState.status, - importingId: null, + [activitiesField]: { + ...state[activitiesField], + progress: defaultProgress, + status: defaultStatus, + // importingId: null, + instance: null, + activities: { + ...activities + }, + }, + instanceType: null, + // progress: defaultState.progress, + // status: defaultState.status, + // // importingId: null, + // instance: null, + // [instances]: { + // ...activities, + // } }; } default: diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts index 88d7210e831..e46917bd55a 100644 --- a/cvat-ui/src/reducers/interfaces.ts +++ b/cvat-ui/src/reducers/interfaces.ts @@ -55,7 +55,7 @@ export interface ProjectsState { [projectId: number]: boolean; } }; - restoring: boolean; + //importing: boolean; } export interface TasksQuery { @@ -124,20 +124,68 @@ export interface TasksState { export interface ExportState { tasks: { - [tid: number]: string[]; + [tid: number]: { + 'dataset': string[], + 'backup': boolean, + }; }; projects: { - [pid: number]: string[]; + [pid: number]: { + 'dataset': string[], + 'backup': boolean, + }; }; + jobs: { + [jid: number]: { + 'dataset': string[], + 'backup': boolean, + }; + } instance: any; + resource: 'dataset' | 'backup' | null; modalVisible: boolean; } -export interface ImportState { +export interface ImportResourceState { + activities: { + [oid: number]: string; // loader name + }; importingId: number | null; progress: number; status: string; instance: any; + //resource: 'dataset' | 'annotation' | null; + modalVisible: boolean; +} + +export interface ImportDatasetState { + // tasks: { + // [tid: number]: string; // loader name + // }; + // projects: { + // [pid: number]: string; // loader name + // }; + // jobs: { + // [jid: number]: string; // loader name + // } + // // TODO is it possible to remove the restriction of importing only one resource at a time + // importingId: number | null; + // progress: number; + // status: string; + // instance: any; + // //resource: 'dataset' | 'annotation' | null; + // modalVisible: boolean; + projects: ImportResourceState | null; + tasks: ImportResourceState | null; + jobs: ImportResourceState | null; + instanceType: 'project' | 'task' | 'job' | null; + resource: any; +} + +export interface ImportBackupState { + isTaskImported: boolean; + isProjectImported: boolean; + instanceType: 'project' | 'task' | null; modalVisible: boolean; } @@ -438,10 +486,12 @@ export interface NotificationsState { exporting: { dataset: null | ErrorState; annotation: null | ErrorState; + backup: null | ErrorState; }; importing: { dataset: null | ErrorState; annotation: null | ErrorState; + backup: null | ErrorState; }; cloudStorages: { creating: null | ErrorState; @@ -478,7 +528,17 @@ export interface NotificationsState { }; projects: { restoringDone: string; - } + }; + exporting: { + dataset: string, + annotation: string, + backup: string, + }; + importing: { + dataset: string, + annotation: string, + backup: string, + }; }; } @@ -735,6 +795,16 @@ export interface ShortcutsState { normalizedKeyMap: Record; } +export enum StorageLocation { + LOCAL = 'local', + CLOUD_STORAGE = 'cloud_storage', +} + +export interface Storage { + location: StorageLocation; + cloudStorageId: number | null | undefined; +} + export enum ReviewStatus { ACCEPTED = 'accepted', REJECTED = 'rejected', @@ -784,7 +854,8 @@ export interface CombinedState { shortcuts: ShortcutsState; review: ReviewState; export: ExportState; - import: ImportState; + import: ImportDatasetState; + importBackup: ImportBackupState; cloudStorages: CloudStoragesState; organizations: OrganizationState; } diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 085da563cbb..37fae9bf886 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -21,6 +21,7 @@ import { ImportActionTypes } from 'actions/import-actions'; import { CloudStorageActionTypes } from 'actions/cloud-storage-actions'; import { OrganizationActionsTypes } from 'actions/organization-actions'; import { JobsActionTypes } from 'actions/jobs-actions'; +import { ImportBackupActionTypes } from 'actions/import-backup-actions'; import getCore from 'cvat-core-wrapper'; import { NotificationsState } from './interfaces'; @@ -128,10 +129,12 @@ const defaultState: NotificationsState = { exporting: { dataset: null, annotation: null, + backup: null, }, importing: { dataset: null, annotation: null, + backup: null, }, cloudStorages: { creating: null, @@ -169,6 +172,16 @@ const defaultState: NotificationsState = { projects: { restoringDone: '', }, + exporting: { + dataset: '', + annotation: '', + backup: '', + }, + importing: { + dataset: '', + annotation: '', + backup: '', + }, }, }; @@ -372,14 +385,29 @@ export default function (state = defaultState, action: AnyAction): Notifications }, }; } + case ExportActionTypes.EXPORT_DATASET_SUCCESS: { + const { instance, isLocal } = action.payload; + return { + ...state, + messages: { + ...state.messages, + exporting: { + ...state.messages.exporting, + dataset: + `Dataset for resource ${instance.id} have been ${(isLocal) ? "downloaded" : "uploaded"} ${(isLocal) ? "locally" : "to cloud storage"}`, + // `
task ${taskID}`, + }, + }, + }; + } case ImportActionTypes.IMPORT_DATASET_FAILED: { - const instanceID = action.payload.instance.id; + const instanceID = action.payload.instanceId; return { ...state, errors: { ...state.errors, - exporting: { - ...state.errors.exporting, + importing: { + ...state.errors.importing, dataset: { message: 'Could not import dataset to the ' + @@ -391,6 +419,36 @@ export default function (state = defaultState, action: AnyAction): Notifications }, }; } + case ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS: { + const { instance } = action.payload; + return { + ...state, + messages: { + ...state.messages, + importing: { + ...state.messages.importing, + backup: + `The ${instance.name} ${instance.id} has been restored successfully`, + }, + }, + }; + } + case ImportBackupActionTypes.IMPORT_BACKUP_FAILED: { + return { + ...state, + errors: { + ...state.errors, + importing: { + ...state.errors.importing, + backup: { + message: + 'Could not restore backup ', + reason: action.payload.error.toString(), + }, + }, + }, + }; + } case TasksActionTypes.GET_TASKS_FAILED: { return { ...state, diff --git a/cvat-ui/src/reducers/projects-reducer.ts b/cvat-ui/src/reducers/projects-reducer.ts index 9e9f5cf1056..0eeb9f262c8 100644 --- a/cvat-ui/src/reducers/projects-reducer.ts +++ b/cvat-ui/src/reducers/projects-reducer.ts @@ -39,7 +39,7 @@ const defaultState: ProjectsState = { }, backups: {}, }, - restoring: false, + importing: false, }; export default (state: ProjectsState = defaultState, action: AnyAction): ProjectsState => { @@ -235,14 +235,14 @@ export default (state: ProjectsState = defaultState, action: AnyAction): Project case ProjectsActionTypes.RESTORE_PROJECT: { return { ...state, - restoring: true, + importing: true, }; } case ProjectsActionTypes.RESTORE_PROJECT_FAILED: case ProjectsActionTypes.RESTORE_PROJECT_SUCCESS: { return { ...state, - restoring: false, + importing: false, }; } diff --git a/cvat-ui/src/reducers/root-reducer.ts b/cvat-ui/src/reducers/root-reducer.ts index 53b91afca5d..667fca8b878 100644 --- a/cvat-ui/src/reducers/root-reducer.ts +++ b/cvat-ui/src/reducers/root-reducer.ts @@ -22,6 +22,7 @@ import exportReducer from './export-reducer'; import importReducer from './import-reducer'; import cloudStoragesReducer from './cloud-storages-reducer'; import organizationsReducer from './organizations-reducer'; +import importBackupReducer from './import-backup-reducer'; export default function createRootReducer(): Reducer { return combineReducers({ @@ -44,5 +45,6 @@ export default function createRootReducer(): Reducer { import: importReducer, cloudStorages: cloudStoragesReducer, organizations: organizationsReducer, + importBackup: importBackupReducer, }); } diff --git a/cvat/apps/engine/backup.py b/cvat/apps/engine/backup.py index 1110b6d56c4..1c9dbf293c6 100644 --- a/cvat/apps/engine/backup.py +++ b/cvat/apps/engine/backup.py @@ -776,7 +776,7 @@ def _export_to_cloud_storage(storage, file_path, file_name): raise NotImplementedError() else: if os.path.exists(file_path): - return Response(status=status.HTTP_201_CREATED) + return Response({'location': location_conf.get('location')}, status=status.HTTP_201_CREATED) elif rq_job.is_failed: exc_info = str(rq_job.exc_info) rq_job.delete() diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index df0589f136c..feabbf74ab7 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -2139,7 +2139,7 @@ def _export_annotations(db_instance, rq_id, request, format_name, action, callba raise NotImplementedError() else: if osp.exists(file_path): - return Response(status=status.HTTP_201_CREATED) + return Response({'location': location_conf.get('location')}, status=status.HTTP_201_CREATED) elif rq_job.is_failed: exc_info = str(rq_job.exc_info) rq_job.delete() From 1b5232d3a6c57b3acfdf66d30300fdd6a65e2b34 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 3 Aug 2022 17:05:57 +0200 Subject: [PATCH 02/60] Implemented import & fixed export && some code cleanup && some fixes && updated notifications --- cvat-core/src/annotations.ts | 7 +- cvat-core/src/server-proxy.ts | 90 +++++++---- cvat-core/src/session.ts | 15 +- cvat-ui/src/actions/annotation-actions.ts | 72 +-------- cvat-ui/src/actions/export-actions.ts | 17 ++- cvat-ui/src/actions/import-actions.ts | 99 ++++++------ cvat-ui/src/actions/import-backup-actions.ts | 14 +- cvat-ui/src/actions/projects-actions.ts | 50 ------ cvat-ui/src/actions/tasks-actions.ts | 99 ------------ .../import-dataset/import-dataset-modal.tsx | 100 ++++++------ .../components/projects-page/actions-menu.tsx | 5 +- .../containers/actions-menu/actions-menu.tsx | 2 +- .../top-bar/annotation-menu.tsx | 22 +-- cvat-ui/src/reducers/annotation-reducer.ts | 18 +-- cvat-ui/src/reducers/export-reducer.ts | 117 +++++++------- cvat-ui/src/reducers/import-reducer.ts | 40 +++-- cvat-ui/src/reducers/interfaces.ts | 17 +-- cvat-ui/src/reducers/notifications-reducer.ts | 144 +++++++----------- cvat-ui/src/reducers/projects-reducer.ts | 45 ------ cvat-ui/src/reducers/tasks-reducer.ts | 45 ------ 20 files changed, 354 insertions(+), 664 deletions(-) diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index 89e66f06885..4d52cdf7a7f 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -223,12 +223,9 @@ ); } - async function uploadAnnotations(session, file, loader) { + async function uploadAnnotations(session, format, useDefaultLocation, sourceStorage, file, fileName) { const sessionType = session instanceof Task ? 'task' : 'job'; - if (!(loader instanceof Loader)) { - throw new ArgumentError('A loader must be instance of Loader class'); - } - await serverProxy.annotations.uploadAnnotations(sessionType, session.id, file, loader.name); + await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file, fileName); } function importAnnotations(session, data) { diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index 713659ecb8a..38fb0583003 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -593,8 +593,8 @@ params.filename = name.replace(/\//g, '_'); } - params.use_default_location = !targetStorage.location; - if (!!targetStorage.location) { + params.use_default_location = !targetStorage || !targetStorage?.location; + if (!!targetStorage?.location) { params.location = targetStorage.location; if (targetStorage.cloudStorageId) { params.cloud_storage_id = targetStorage.cloudStorageId; @@ -683,7 +683,6 @@ params, proxy: config.proxy, }); - await wait(); } catch (errorData) { throw generateError(errorData); } @@ -712,11 +711,15 @@ proxy: config.proxy, headers: { 'Upload-Finish': true }, }); - await wait(); } catch (errorData) { throw generateError(errorData); } } + try { + return await wait(); + } catch (errorData) { + throw generateError(errorData); + } } async function exportTask(id, fileName, targetStorage) { @@ -1423,37 +1426,29 @@ } // Session is 'task' or 'job' - async function uploadAnnotations(session, id, file, format) { + async function uploadAnnotations(session, id, format, useDefaultLocation, sourceStorage, file, fileName) { const { backendAPI, origin } = config; - const params = { + const params: any = { ...enableOrganization(), format, - filename: file.name, - }; - const chunkSize = config.uploadChunkSize * 1024 * 1024; - const uploadConfig = { - chunkSize, - endpoint: `${origin}${backendAPI}/${session}s/${id}/annotations/`, + filename: (file) ? file.name : fileName, }; - try { - await Axios.post(`${backendAPI}/${session}s/${id}/annotations`, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - await chunkUpload(file, uploadConfig); - await Axios.post(`${backendAPI}/${session}s/${id}/annotations`, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); + params.use_default_location = useDefaultLocation; + if (!useDefaultLocation) { + params.location = sourceStorage.location; + if (sourceStorage.cloudStorageId) { + params.cloud_storage_id = sourceStorage.cloudStorageId; + } + } + + const url = `${backendAPI}/${session}s/${id}/annotations`; + + async function wait() { return new Promise((resolve, reject) => { async function requestStatus() { try { const response = await Axios.put( - `${backendAPI}/${session}s/${id}/annotations`, + url, new FormData(), { params, @@ -1471,6 +1466,47 @@ } setTimeout(requestStatus); }); + } + + if (sourceStorage.location === 'cloud_storage') { + try { + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); + } + } else { + const chunkSize = config.uploadChunkSize * 1024 * 1024; + const uploadConfig = { + chunkSize, + endpoint: `${origin}${backendAPI}/${session}s/${id}/annotations/`, + }; + + try { + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + await chunkUpload(file, uploadConfig); + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); + + } catch (errorData) { + throw generateError(errorData); + } + } + + try { + return await wait(); } catch (errorData) { throw generateError(errorData); } diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 2c58023c2ce..09d8924601f 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -32,12 +32,15 @@ Object.defineProperties(prototype, { annotations: Object.freeze({ value: { - async upload(file, loader) { + async upload(format, useDefaultLocation, sourceStorage, file, fileName) { const result = await PluginRegistry.apiWrapper.call( this, prototype.annotations.upload, + format, + useDefaultLocation, + sourceStorage, file, - loader, + fileName, ); return result; }, @@ -2222,8 +2225,8 @@ return result; }; - Job.prototype.annotations.upload.implementation = async function (file, loader) { - const result = await uploadAnnotations(this, file, loader); + Job.prototype.annotations.upload.implementation = async function (format, useDefaultLocation, sourceStorage, file, fileName) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file, fileName); return result; }; @@ -2644,8 +2647,8 @@ return result; }; - Task.prototype.annotations.upload.implementation = async function (file, loader) { - const result = await uploadAnnotations(this, file, loader); + Task.prototype.annotations.upload.implementation = async function (format, useDefaultLocation, sourceStorage, file, fileName) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file, fileName); return result; }; diff --git a/cvat-ui/src/actions/annotation-actions.ts b/cvat-ui/src/actions/annotation-actions.ts index 52e21120800..9206cec8e1f 100644 --- a/cvat-ui/src/actions/annotation-actions.ts +++ b/cvat-ui/src/actions/annotation-actions.ts @@ -49,7 +49,7 @@ function getStore(): Store { return store; } -function receiveAnnotationsParameters(): AnnotationsParameters { +export function receiveAnnotationsParameters(): AnnotationsParameters { if (store === null) { store = getCVATStore(); } @@ -88,7 +88,7 @@ export function computeZRange(states: any[]): number[] { return [minZ, maxZ]; } -async function jobInfoGenerator(job: any): Promise> { +export async function jobInfoGenerator(job: any): Promise> { const { total } = await job.annotations.statistics(); return { 'frame count': job.stopFrame - job.startFrame + 1, @@ -349,74 +349,6 @@ export function removeAnnotationsAsync( }; } -export function uploadJobAnnotationsAsync(job: any, loader: any, file: File): ThunkAction { - return async (dispatch: ActionCreator): Promise => { - try { - const state: CombinedState = getStore().getState(); - const { filters, showAllInterpolationTracks } = receiveAnnotationsParameters(); - - if (state.tasks.activities.loads[job.taskId]) { - throw Error('Annotations is being uploaded for the task'); - } - if (state.annotation.activities.loads[job.id]) { - throw Error('Only one uploading of annotations for a job allowed at the same time'); - } - - dispatch({ - type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS, - payload: { - job, - loader, - }, - }); - - const frame = state.annotation.player.frame.number; - await job.annotations.upload(file, loader); - - await job.logger.log(LogType.uploadAnnotations, { - ...(await jobInfoGenerator(job)), - }); - - await job.annotations.clear(true); - await job.actions.clear(); - const history = await job.actions.get(); - - // One more update to escape some problems - // in canvas when shape with the same - // clientID has different type (polygon, rectangle) for example - dispatch({ - type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, - payload: { - job, - states: [], - history, - }, - }); - - const states = await job.annotations.get(frame, showAllInterpolationTracks, filters); - - setTimeout(() => { - dispatch({ - type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, - payload: { - history, - job, - states, - }, - }); - }); - } catch (error) { - dispatch({ - type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_FAILED, - payload: { - job, - error, - }, - }); - } - }; -} - export function collectStatisticsAsync(sessionInstance: any): ThunkAction { return async (dispatch: ActionCreator): Promise => { try { diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 94fca85fba5..f1fe45dcda8 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -5,6 +5,10 @@ import { ActionUnion, createAction, ThunkAction } from 'utils/redux'; import { Storage } from 'reducers/interfaces'; +import getCore from 'cvat-core-wrapper'; + +const core = getCore(); + export enum ExportActionTypes { OPEN_EXPORT_MODAL = 'OPEN_EXPORT_MODAL', CLOSE_EXPORT_MODAL = 'CLOSE_EXPORT_MODAL', @@ -37,11 +41,11 @@ export const exportActions = { exportBackup: (instanceId: number) => ( createAction(ExportActionTypes.EXPORT_BACKUP, { instanceId }) ), - exportBackupSuccess: (instanceId: number) => ( - createAction(ExportActionTypes.EXPORT_BACKUP_SUCCESS, { instanceId }) + exportBackupSuccess: (instanceId: number, instanceType: 'task' | 'project', isLocal: boolean) => ( + createAction(ExportActionTypes.EXPORT_BACKUP_SUCCESS, { instanceId, instanceType, isLocal }) ), - exportBackupFailed: (instanceId: number, error: any) => ( - createAction(ExportActionTypes.EXPORT_BACKUP_FAILED, { instanceId, error }) + exportBackupFailed: (instanceId: number, instanceType: 'task' | 'project', error: any) => ( + createAction(ExportActionTypes.EXPORT_BACKUP_FAILED, { instanceId, instanceType, error }) ), }; @@ -69,6 +73,7 @@ export const exportDatasetAsync = ( export const exportBackupAsync = (instance: any, fileName: string, targetStorage: Storage | null): ThunkAction => async (dispatch) => { dispatch(exportActions.exportBackup(instance.id)); + const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; try { const result = await instance.export(fileName, targetStorage); @@ -77,9 +82,9 @@ export const exportBackupAsync = (instance: any, fileName: string, targetStorage downloadAnchor.href = result; downloadAnchor.click(); } - dispatch(exportActions.exportBackupSuccess(instance.id)); + dispatch(exportActions.exportBackupSuccess(instance.id, instanceType, !!result)); } catch (error) { - dispatch(exportActions.exportBackupFailed(instance.id, error as Error)); + dispatch(exportActions.exportBackupFailed(instance.id, instanceType, error as Error)); } }; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 42cf44abfc8..823a323d828 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -7,6 +7,9 @@ import { CombinedState } from 'reducers/interfaces'; import { getProjectsAsync } from './projects-actions'; import { Storage } from 'reducers/interfaces'; import getCore from 'cvat-core-wrapper'; +import { LogType } from 'cvat-logger'; + +import { jobInfoGenerator, receiveAnnotationsParameters, AnnotationActionTypes } from 'actions/annotation-actions'; const core = getCore(); @@ -20,15 +23,15 @@ export enum ImportActionTypes { } export const importActions = { - openImportModal: (instance: any, instanceType: any, resource: 'dataset' | 'annotation') => - createAction(ImportActionTypes.OPEN_IMPORT_MODAL, { instance, instanceType, resource }), + openImportModal: (instance: any, resource: 'dataset' | 'annotation') => + createAction(ImportActionTypes.OPEN_IMPORT_MODAL, { instance, resource }), closeImportModal: (instance: any) => createAction(ImportActionTypes.CLOSE_IMPORT_MODAL, { instance }), importDataset: (instance: any, format: string) => ( createAction(ImportActionTypes.IMPORT_DATASET, { instance, format }) ), - importDatasetSuccess: (instance: any) => ( - createAction(ImportActionTypes.IMPORT_DATASET_SUCCESS, { instance }) + importDatasetSuccess: (instance: any, resource: 'dataset' | 'annotation') => ( + createAction(ImportActionTypes.IMPORT_DATASET_SUCCESS, { instance, resource }) ), importDatasetFailed: (instance: any, error: any) => ( createAction(ImportActionTypes.IMPORT_DATASET_FAILED, { @@ -45,13 +48,10 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett async (dispatch, getState) => { try { const state: CombinedState = getState(); - // if (state.import.importingId !== null) { - // throw Error('Only one importing of annotation/dataset allowed at the same time'); - // } - // dispatch(importActions.importDataset(instance.id, format)); + if (instance instanceof core.classes.Project) { // TODO change importingId - if (state.import.projects?.instance !== null) { + if (state.import.instance !== null) { throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); @@ -59,7 +59,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else if (instance instanceof core.classes.Task) { - if (state.import.tasks?.instance !== null) { + if (state.import.instance !== null) { throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); @@ -68,54 +68,57 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else { // job - // if (state.tasks.activities.loads[job.taskId]) { - // throw Error('Annotations is being uploaded for the task'); - // } - // if (state.annotation.activities.loads[job.id]) { - // throw Error('Only one uploading of annotations for a job allowed at the same time'); - // } - // const frame = state.annotation.player.frame.number; - // await job.annotations.upload(file, loader); - - // await job.logger.log(LogType.uploadAnnotations, { - // ...(await jobInfoGenerator(job)), - // }); - - // await job.annotations.clear(true); - // await job.actions.clear(); - // const history = await job.actions.get(); + if (state.import.tasks[instance.taskId]) { + throw Error('Annotations is being uploaded for the task'); + } + if (state.import.jobs[instance.id]) { + throw Error('Only one uploading of annotations for a job allowed at the same time'); + } + const { filters, showAllInterpolationTracks } = receiveAnnotationsParameters(); + + dispatch(importActions.importDataset(instance, format)); + + const frame = state.annotation.player.frame.number; + await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName); + + await instance.logger.log(LogType.uploadAnnotations, { + ...(await jobInfoGenerator(instance)), + }); + + await instance.annotations.clear(true); + await instance.actions.clear(); + const history = await instance.actions.get(); // // One more update to escape some problems // // in canvas when shape with the same // // clientID has different type (polygon, rectangle) for example - // dispatch({ - // type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, - // payload: { - // job, - // states: [], - // history, - // }, - // }); - - // const states = await job.annotations.get(frame, showAllInterpolationTracks, filters); - - // setTimeout(() => { - // dispatch({ - // type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, - // payload: { - // history, - // job, - // states, - // }, - // }); - // }); + dispatch({ + type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, + payload: { + states: [], + history, + }, + }); + + const states = await instance.annotations.get(frame, showAllInterpolationTracks, filters); + + setTimeout(() => { + dispatch({ + type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, + payload: { + history, + states, + }, + }); + }); } } catch (error) { dispatch(importActions.importDatasetFailed(instance, error)); return; } - dispatch(importActions.importDatasetSuccess(instance)); + const resource = (instance instanceof core.classes.Project) ? 'dataset' : 'annotation'; + dispatch(importActions.importDatasetSuccess(instance, resource)); if (instance instanceof core.classes.Project) { dispatch(getProjectsAsync({ id: instance.id }, getState().projects.tasksGettingQuery)); } diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index cd1ea9ce379..782e4a0ad13 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -24,23 +24,23 @@ export const importBackupActions = { ), closeImportModal: () => createAction(ImportBackupActionTypes.CLOSE_IMPORT_MODAL), importBackup: () => createAction(ImportBackupActionTypes.IMPORT_BACKUP), - importBackupSuccess: (instance: any) => ( - createAction(ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS, { instance }) + importBackupSuccess: (instanceId: number, instanceType: 'project' | 'task') => ( + createAction(ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS, { instanceId, instanceType }) ), - importBackupFailed: (error: any) => ( - createAction(ImportBackupActionTypes.IMPORT_BACKUP_FAILED, { error }) + importBackupFailed: (instanceType: 'project' | 'task', error: any) => ( + createAction(ImportBackupActionTypes.IMPORT_BACKUP_FAILED, { instanceType, error }) ), }; -export const importBackupAsync = (instanceType: 'project' | 'task' | null, storage: any, file: File | null, fileName: string | null): ThunkAction => ( +export const importBackupAsync = (instanceType: 'project' | 'task', storage: any, file: File | null, fileName: string | null): ThunkAction => ( async (dispatch) => { dispatch(importBackupActions.importBackup()); try { const inctanceClass = (instanceType === 'task') ? core.classes.Task : core.classes.Project; const instance = await inctanceClass.import(storage, file, fileName); - dispatch(importBackupActions.importBackupSuccess(instance)); + dispatch(importBackupActions.importBackupSuccess(instance.id, instanceType)); } catch (error) { - dispatch(importBackupActions.importBackupFailed(error)); + dispatch(importBackupActions.importBackupFailed(instanceType, error)); } }); diff --git a/cvat-ui/src/actions/projects-actions.ts b/cvat-ui/src/actions/projects-actions.ts index 6cbf3932c60..6cd131090eb 100644 --- a/cvat-ui/src/actions/projects-actions.ts +++ b/cvat-ui/src/actions/projects-actions.ts @@ -28,12 +28,6 @@ export enum ProjectsActionTypes { DELETE_PROJECT = 'DELETE_PROJECT', DELETE_PROJECT_SUCCESS = 'DELETE_PROJECT_SUCCESS', DELETE_PROJECT_FAILED = 'DELETE_PROJECT_FAILED', - BACKUP_PROJECT = 'BACKUP_PROJECT', - BACKUP_PROJECT_SUCCESS = 'BACKUP_PROJECT_SUCCESS', - BACKUP_PROJECT_FAILED = 'BACKUP_PROJECT_FAILED', - RESTORE_PROJECT = 'IMPORT_PROJECT', - RESTORE_PROJECT_SUCCESS = 'IMPORT_PROJECT_SUCCESS', - RESTORE_PROJECT_FAILED = 'IMPORT_PROJECT_FAILED', } // prettier-ignore @@ -63,20 +57,6 @@ const projectActions = { deleteProjectFailed: (projectId: number, error: any) => ( createAction(ProjectsActionTypes.DELETE_PROJECT_FAILED, { projectId, error }) ), - // backupProject: (projectId: number) => createAction(ProjectsActionTypes.BACKUP_PROJECT, { projectId }), - // backupProjectSuccess: (projectID: number) => ( - // createAction(ProjectsActionTypes.BACKUP_PROJECT_SUCCESS, { projectID }) - // ), - // backupProjectFailed: (projectID: number, error: any) => ( - // createAction(ProjectsActionTypes.BACKUP_PROJECT_FAILED, { projectId: projectID, error }) - // ), - // restoreProject: () => createAction(ProjectsActionTypes.RESTORE_PROJECT), - // restoreProjectSuccess: (projectID: number) => ( - // createAction(ProjectsActionTypes.RESTORE_PROJECT_SUCCESS, { projectID }) - // ), - // restoreProjectFailed: (error: any) => ( - // createAction(ProjectsActionTypes.RESTORE_PROJECT_FAILED, { error }) - // ), }; export type ProjectActions = ActionUnion; @@ -188,33 +168,3 @@ export function deleteProjectAsync(projectInstance: any): ThunkAction { } }; } - -// export function restoreProjectAsync(storage: any, file: File | null, fileName: string | null): ThunkAction { -// return async (dispatch: ActionCreator): Promise => { -// dispatch(projectActions.restoreProject()); -// try { -// const projectInstance = await cvat.classes.Project.restore(storage, file, fileName); -// dispatch(projectActions.restoreProjectSuccess(projectInstance)); -// } catch (error) { -// dispatch(projectActions.restoreProjectFailed(error)); -// } -// }; -// } - -// export function backupProjectAsync(projectInstance: any): ThunkAction { -// return async (dispatch: ActionCreator): Promise => { -// dispatch(projectActions.backupProject(projectInstance.id)); - -// try { -// const result = await projectInstance.backup(); -// if (result) { -// const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; -// downloadAnchor.href = result; -// downloadAnchor.click(); -// } -// dispatch(projectActions.backupProjectSuccess(projectInstance.id)); -// } catch (error) { -// dispatch(projectActions.backupProjectFailed(projectInstance.id, error)); -// } -// }; -// } diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index e7d2f612b10..fdbaa45efa4 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -33,12 +33,6 @@ export enum TasksActionTypes { UPDATE_JOB_SUCCESS = 'UPDATE_JOB_SUCCESS', UPDATE_JOB_FAILED = 'UPDATE_JOB_FAILED', HIDE_EMPTY_TASKS = 'HIDE_EMPTY_TASKS', - // EXPORT_TASK = 'EXPORT_TASK', - // EXPORT_TASK_SUCCESS = 'EXPORT_TASK_SUCCESS', - // EXPORT_TASK_FAILED = 'EXPORT_TASK_FAILED', - // IMPORT_TASK = 'IMPORT_TASK', - // IMPORT_TASK_SUCCESS = 'IMPORT_TASK_SUCCESS', - // IMPORT_TASK_FAILED = 'IMPORT_TASK_FAILED', SWITCH_MOVE_TASK_MODAL_VISIBLE = 'SWITCH_MOVE_TASK_MODAL_VISIBLE', } @@ -162,99 +156,6 @@ export function loadAnnotationsAsync( }; } -// function importTask(): AnyAction { -// const action = { -// type: TasksActionTypes.IMPORT_TASK, -// payload: {}, -// }; - -// return action; -// } - -// function importTaskSuccess(task: any): AnyAction { -// const action = { -// type: TasksActionTypes.IMPORT_TASK_SUCCESS, -// payload: { -// task, -// }, -// }; - -// return action; -// } - -// function importTaskFailed(error: any): AnyAction { -// const action = { -// type: TasksActionTypes.IMPORT_TASK_FAILED, -// payload: { -// error, -// }, -// }; - -// return action; -// } - -// export function importTaskAsync(storage: any, file: File | null, fileName: string | null): ThunkAction, {}, {}, AnyAction> { -// return async (dispatch: ActionCreator): Promise => { -// try { -// dispatch(importTask()); -// const taskInstance = await cvat.classes.Task.import(storage, file, fileName); -// dispatch(importTaskSuccess(taskInstance)); -// } catch (error) { -// dispatch(importTaskFailed(error)); -// } -// }; -// } - -// function exportTask(taskID: number): AnyAction { -// const action = { -// type: TasksActionTypes.EXPORT_TASK, -// payload: { -// taskID, -// }, -// }; - -// return action; -// } - -// function exportTaskSuccess(taskID: number): AnyAction { -// const action = { -// type: TasksActionTypes.EXPORT_TASK_SUCCESS, -// payload: { -// taskID, -// }, -// }; - -// return action; -// } - -// function exportTaskFailed(taskID: number, error: Error): AnyAction { -// const action = { -// type: TasksActionTypes.EXPORT_TASK_FAILED, -// payload: { -// taskID, -// error, -// }, -// }; - -// return action; -// } - -// export function exportTaskAsync(taskInstance: any): ThunkAction, {}, {}, AnyAction> { -// return async (dispatch: ActionCreator): Promise => { -// dispatch(exportTask(taskInstance.id)); - -// try { -// const url = await taskInstance.export(); -// const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; -// downloadAnchor.href = url; -// downloadAnchor.click(); -// dispatch(exportTaskSuccess(taskInstance.id)); -// } catch (error) { -// dispatch(exportTaskFailed(taskInstance.id, error as Error)); -// } -// }; -// } - function deleteTask(taskID: number): AnyAction { const action = { type: TasksActionTypes.DELETE_TASK, diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 0bdbccf50c4..62b365f2a93 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -22,7 +22,6 @@ import { import CVATTooltip from 'components/common/cvat-tooltip'; import { CombinedState } from 'reducers/interfaces'; import { importActions, importDatasetAsync } from 'actions/import-actions'; -import { uploadJobAnnotationsAsync } from 'actions/annotation-actions'; import ImportDatasetStatusModal from './import-dataset-status-modal'; import Space from 'antd/lib/space'; @@ -63,42 +62,31 @@ function ImportDatasetModal(): JSX.Element | null { const dispatch = useDispatch(); const resource = useSelector((state: CombinedState) => state.import.resource); - const instanceT = useSelector((state: CombinedState) => state.import.instanceType); + const instance = useSelector((state: CombinedState) => state.import.instance); const projectsImportState = useSelector((state: CombinedState) => state.import.projects); const tasksImportState = useSelector((state: CombinedState) => state.import.tasks); const jobsImportState = useSelector((state: CombinedState) => state.import.jobs); - const [modalVisible, setModalVisible] = useState(false); - const [instance, setInstance] = useState(null); + const importing = useSelector((state: CombinedState) => state.import.importing); - useEffect(() => { - if (instanceT === 'project' && projectsImportState) { - setModalVisible(projectsImportState.modalVisible); - setInstance(projectsImportState.instance); - } else if (instanceT === 'task' && tasksImportState) { - setModalVisible(tasksImportState.modalVisible); - setInstance(tasksImportState.instance); - } else if (instanceT === 'job' && jobsImportState) { - setModalVisible(jobsImportState.modalVisible); - setInstance(jobsImportState.instance); - } - }, [instanceT, projectsImportState, tasksImportState, jobsImportState]) + const [selectedLoader, setSelectedLoader] = useState(null); - // const modalVisible = useSelector((state: CombinedState) => { + const isDataset = useCallback((): boolean => { + return resource === 'dataset'; + }, [resource]); - // }); - //const instance = useSelector((state: CombinedState) => state.import.instance); - //const currentImportId = useSelector((state: CombinedState) => state.import.importingId); + const isAnnotation = useCallback((): boolean => { + return resource === 'annotation'; + }, [resource]); + const modalVisible = useSelector((state: CombinedState) => state.import.modalVisible); - // todo need to remove one of state item or form item const [useDefaultSettings, setUseDefaultSettings] = useState(true); const [defaultStorageLocation, setDefaultStorageLocation] = useState(''); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); const [helpMessage, setHelpMessage] = useState(''); const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); - const [uploadParams, setUploadParams] = useState(null); useEffect(() => { @@ -125,6 +113,7 @@ function ImportDatasetModal(): JSX.Element | null { : null); } }); + setInstanceType(`job #${instance.id}`); } } }, [instance?.id, resource, instance?.sourceStorage]); @@ -141,9 +130,15 @@ function ImportDatasetModal(): JSX.Element | null { { - if (!['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { - message.error('Only ZIP archive is supported'); + if (!selectedLoader) { + message.warn('Please select a format first'); + } else if (isDataset() && !['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { + message.error('Only ZIP archive is supported for import a dataset'); + } else if (isAnnotation() && + !selectedLoader.format.toLowerCase().split(', ').includes(_file.name.split('.')[1])) { + message.error(`For ${selectedLoader.name} format only files with ${selectedLoader.format.toLowerCase()} extension can be used`); } else { setFile(_file); } @@ -176,13 +171,10 @@ function ImportDatasetModal(): JSX.Element | null { form.resetFields(); setFile(null); dispatch(importActions.closeImportModal(instance)); - }, [form]); + }, [form, instance]); const onUpload = () => { if (uploadParams && uploadParams.resource) { - // if (instance instanceof core.classes.Job) { - // dispatch(uploadJobAnnotationsAsync(instance, loader, file)); - // } dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, uploadParams.useDefaultSettings, uploadParams.sourceStorage, @@ -220,7 +212,7 @@ function ImportDatasetModal(): JSX.Element | null { }); return; } - const fileName = (values.location === StorageLocation.CLOUD_STORAGE) ? values.fileName : null; + const fileName = values.fileName || null; const sourceStorage = { location: (values.location) ? values.location : defaultStorageLocation, cloudStorageId: (values.location) ? values.cloudStorageId : defaultStorageCloudId, @@ -235,36 +227,34 @@ function ImportDatasetModal(): JSX.Element | null { fileName: fileName || null }); - if (resource === 'annotation') { + if (isAnnotation()) { confirmUpload(); } else { onUpload(); } closeModal(); }, - // another dependensis like instance type - [instance?.id, file, useDefaultSettings], + [instance?.id, file, useDefaultSettings, resource, defaultStorageLocation], ); - // if (!(resource in ['dataset', 'annotation'])) { - // return null; - // } - return ( <> Import {resource} to {instanceType} - - - + { + instance instanceof core.classes.Project && + + + + } )} visible={modalVisible} @@ -284,7 +274,16 @@ function ImportDatasetModal(): JSX.Element | null { label='Import format' rules={[{ required: true, message: 'Format must be selected' }]} > - { + const [_loader] = importers.filter( + (importer: any): boolean => importer.name === _format + ); + setSelectedLoader(_loader); + }} + > {importers .sort((a: any, b: any) => a.name.localeCompare(b.name)) .filter( @@ -295,9 +294,7 @@ function ImportDatasetModal(): JSX.Element | null { ) .map( (importer: any): JSX.Element => { - // const pending = currentImportId !== null; - // FIXME - const pending = false; + const pending = importing; const disabled = !importer.enabled || pending; return ( {useDefaultSettings && defaultStorageLocation === StorageLocation.LOCAL && uploadLocalFile()} + {useDefaultSettings && defaultStorageLocation === StorageLocation.CLOUD_STORAGE && renderCustomName()} {!useDefaultSettings && setSelectedSourceStorage(value)} />} {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.LOCAL && uploadLocalFile()} - {resource === 'dataset' && } + {isDataset() && } ); } diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 78e5816e68f..1157954d713 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -17,12 +17,11 @@ interface Props { projectInstance: any; } -// TODO refactor export project backup export default function ProjectActionsMenuComponent(props: Props): JSX.Element { const { projectInstance } = props; const dispatch = useDispatch(); - const activeBackups = useSelector((state: CombinedState) => state.projects.activities.backups); + const activeBackups = useSelector((state: CombinedState) => state.export.projects); const exportIsActive = projectInstance.id in activeBackups; const onDeleteProject = useCallback((): void => { @@ -46,7 +45,7 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { dispatch(exportActions.openExportModal(projectInstance, 'dataset'))}> Export dataset - dispatch(importActions.openImportModal(projectInstance, 'project', 'dataset'))}> + dispatch(importActions.openImportModal(projectInstance, 'dataset'))}> Import dataset { - dispatch(importActions.openImportModal(taskInstance, 'task', 'annotation')); + dispatch(importActions.openImportModal(taskInstance, 'annotation')); }, deleteTask: (taskInstance: any): void => { dispatch(deleteTaskAsync(taskInstance)); diff --git a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx index 35cb2ef97c4..c83f114e014 100644 --- a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx @@ -12,7 +12,6 @@ import { CombinedState, JobStage } from 'reducers/interfaces'; import AnnotationMenuComponent, { Actions } from 'components/annotation-page/top-bar/annotation-menu'; import { updateJobAsync } from 'actions/tasks-actions'; import { - uploadJobAnnotationsAsync, saveAnnotationsAsync, setForceExitAnnotationFlag as setForceExitAnnotationFlagAction, removeAnnotationsAsync as removeAnnotationsAsyncAction, @@ -31,9 +30,8 @@ interface StateToProps { } interface DispatchToProps { - // loadAnnotations(job: any, loader: any, file: File): void; - showExportModal: (jobInstance: any, resource: 'dataset' | 'backup' | null) => void; - showImportModal: (jobInstance: any, resource: 'dataset' | 'backup' | null) => void; + showExportModal: (jobInstance: any, resource: 'dataset' | 'backup') => void; + showImportModal: (jobInstance: any, resource: 'dataset' | 'annotation') => void; removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly: boolean): void; setForceExitAnnotationFlag(forceExit: boolean): void; saveAnnotations(jobInstance: any, afterSave?: () => void): void; @@ -68,14 +66,11 @@ function mapStateToProps(state: CombinedState): StateToProps { function mapDispatchToProps(dispatch: any): DispatchToProps { return { - // loadAnnotations(job: any, loader: any, file: File): void { - // dispatch(uploadJobAnnotationsAsync(job, loader, file)); - // }, - showExportModal(taskInstance: any, resource: 'dataset' | 'backup' | null): void { + showExportModal(taskInstance: any, resource: 'dataset' | 'backup'): void { dispatch(exportActions.openExportModal(taskInstance, resource)); }, - showImportModal(taskInstance: any, resource: 'dataset' | 'backup' | null): void { - dispatch(importActions.openImportModal(taskInstance, 'task', resource)); + showImportModal(taskInstance: any, resource: 'dataset' | 'annotation'): void { + dispatch(importActions.openImportModal(taskInstance, resource)); }, removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly:boolean) { dispatch(removeAnnotationsAsyncAction(startnumber, endnumber, delTrackKeyframesOnly)); @@ -143,12 +138,7 @@ function AnnotationMenuContainer(props: Props): JSX.Element { updateJob(jobInstance); window.location.reload(); } else if (action === Actions.LOAD_JOB_ANNO) { - core.tasks.get({ id: jobInstance.taskId }).then((response: any) => { - if (response.length) { - const [taskInstance] = response; - showImportModal(taskInstance, 'dataset'); - } - }); + showImportModal(jobInstance, 'annotation'); } }; diff --git a/cvat-ui/src/reducers/annotation-reducer.ts b/cvat-ui/src/reducers/annotation-reducer.ts index cc1be926442..3d7a35c35c1 100644 --- a/cvat-ui/src/reducers/annotation-reducer.ts +++ b/cvat-ui/src/reducers/annotation-reducer.ts @@ -926,19 +926,19 @@ export default (state = defaultState, action: AnyAction): AnnotationState => { }; } case AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS: { - const { states, job, history } = action.payload; - const { loads } = state.activities; + const { states, history } = action.payload; + // const { loads } = state.activities; - delete loads[job.id]; + // delete loads[job.id]; return { ...state, - activities: { - ...state.activities, - loads: { - ...loads, - }, - }, + // activities: { + // ...state.activities, + // loads: { + // ...loads, + // }, + // }, annotations: { ...state.annotations, history, diff --git a/cvat-ui/src/reducers/export-reducer.ts b/cvat-ui/src/reducers/export-reducer.ts index 939afc53cbf..53d7f51f173 100644 --- a/cvat-ui/src/reducers/export-reducer.ts +++ b/cvat-ui/src/reducers/export-reducer.ts @@ -33,8 +33,8 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor return { ...state, modalVisible: false, - instance: null, - resource: null, + // instance: null, + // resource: null, }; case ExportActionTypes.EXPORT_DATASET: { const { instance, format } = action.payload; @@ -51,16 +51,18 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor field = 'jobs'; } - - // deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); - // const instanceId = instance instanceof core.classes.Project || - // instance instanceof core.classes.Task ? instance.id : instance.taskId; const instanceId = instance.id; + if (!activities[instanceId]) { + activities[instanceId] = { + 'dataset': [], + 'backup': false, + } + } activities[instanceId].dataset = instanceId in activities && !activities[instanceId].dataset.includes(format) ? [...activities[instanceId].dataset, format] : - activities[instanceId].dataset || [format]; + activities[instanceId]?.dataset || [format]; return { ...state, @@ -82,29 +84,8 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor activities = deepCopy(state.jobs); field = 'jobs'; } - // switch (typeof instance) { - // case core.classes.Project: { - // activities = deepCopy(state.projects); - // field = 'projects'; - // break; - // } - // case core.classes.Task: { - // activities = deepCopy(state.tasks); - // field = 'tasks'; - // break; - // } - // case core.classes.Job: { - // activities = deepCopy(state.jobs); - // field = 'jobs'; - // break; - // } - // default: - // } - const instanceId = instance.id; - // const activities = deepCopy(instance instanceof core.classes.Project ? state.projects : state.tasks); - // const instanceId = instance instanceof core.classes.Project || - // instance instanceof core.classes.Task ? instance.id : instance.taskId; + const instanceId = instance.id; activities[instanceId].dataset = activities[instanceId].dataset.filter( (exporterName: string): boolean => exporterName !== format, @@ -115,44 +96,66 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor ...{[field]: activities}, }; } - case ExportActionTypes.EXPORT_TASK: { - const { taskId } = action.payload; - //const { backups } = state; + case ExportActionTypes.EXPORT_BACKUP: { + const { instanceId } = action.payload; + const { instance } = state; + + let activities; + let field; + if (instance instanceof core.classes.Project) { + activities = deepCopy(state.projects); + field = 'projects'; + } else if (instance instanceof core.classes.Task) { + activities = deepCopy(state.tasks); + field = 'tasks'; + } else { + activities = deepCopy(state.jobs); + field = 'jobs'; + } + + activities[instanceId] = { + ...activities[instanceId], + 'backup': true, + } return { ...state, - tasks: { - ...state.tasks, - [taskId]: { - ...state.tasks[taskId], - 'backup': true, - } - + [field]: { + ...activities, } - // : { - // ...backups, - // ...Object.fromEntries([[taskId, true]]), - // }, }; } - case ExportActionTypes.EXPORT_TASK_FAILED: - case ExportActionTypes.EXPORT_TASK_SUCCESS: { - const { taskId } = action.payload; - // const { backup } = state.tasks[taskId]; + case ExportActionTypes.EXPORT_BACKUP_FAILED: + case ExportActionTypes.EXPORT_BACKUP_SUCCESS: { + const { instanceId } = action.payload; + + const { instance } = state; + + let activities; + let field; + if (instance instanceof core.classes.Project) { + activities = deepCopy(state.projects); + field = 'projects'; + } else if (instance instanceof core.classes.Task) { + activities = deepCopy(state.tasks); + field = 'tasks'; + } else { + activities = deepCopy(state.jobs); + field = 'jobs'; + } - // delete backup; + activities[instanceId] = { + ...activities[instanceId], + 'backup': false, + } - // TODO taskid maybe undefined? return { ...state, - tasks: { - ...state.tasks, - [taskId]: { - ...state.tasks[taskId], - 'backup': false, - } - } - // backups: omit(backups, [taskId]), + [field]: { + ...activities, + }, + instance: null, + resource: null, }; } default: diff --git a/cvat-ui/src/reducers/import-reducer.ts b/cvat-ui/src/reducers/import-reducer.ts index 2b2b04b2de5..322b454d3a5 100644 --- a/cvat-ui/src/reducers/import-reducer.ts +++ b/cvat-ui/src/reducers/import-reducer.ts @@ -40,44 +40,49 @@ const defaultState: ImportDatasetState = { importingId: null, progress: defaultProgress, status: defaultStatus, - instance: null, - modalVisible: false, + // instance: null, + // modalVisible: false, }, tasks: { activities: {}, importingId: null, progress: defaultProgress, status: defaultStatus, - instance: null, - modalVisible: false, + // instance: null, + // modalVisible: false, }, jobs: { activities: {}, importingId: null, progress: defaultProgress, status: defaultStatus, - instance: null, - modalVisible: false, + // instance: null, + // modalVisible: false, }, - instanceType: null, + instance: null, + importing: false, + // instanceType: null, resource: null, + modalVisible: false, }; export default (state: ImportDatasetState = defaultState, action: ImportActions): ImportDatasetState => { switch (action.type) { case ImportActionTypes.OPEN_IMPORT_MODAL: - const { instance, instanceType, resource } = action.payload; + const { instance, resource } = action.payload; const activitiesField = defineActititiesField(instance); return { ...state, [activitiesField]: { ...state[activitiesField], - modalVisible: true, - instance: instance, + // modalVisible: true, + // instance: instance, }, - instanceType: instanceType, + // instanceType: instanceType, + instance: instance, resource: resource, + modalVisible: true, }; case ImportActionTypes.CLOSE_IMPORT_MODAL: { const { instance } = action.payload; @@ -87,10 +92,11 @@ export default (state: ImportDatasetState = defaultState, action: ImportActions) ...state, [activitiesField]: { ...state[activitiesField], - modalVisible: false, - instance: null, + // modalVisible: false, }, resource: null, + instance: null, + modalVisible: false, }; } case ImportActionTypes.IMPORT_DATASET: { @@ -109,6 +115,7 @@ export default (state: ImportDatasetState = defaultState, action: ImportActions) }, status: 'The file is being uploaded to the server', }, + importing: true, //importingId: id, }; } @@ -140,12 +147,15 @@ export default (state: ImportDatasetState = defaultState, action: ImportActions) progress: defaultProgress, status: defaultStatus, // importingId: null, - instance: null, + //instance: null, activities: { ...activities }, }, - instanceType: null, + //instanceType: null, + instance: null, + resource: null, + importing: false, // progress: defaultState.progress, // status: defaultState.status, // // importingId: null, diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts index e46917bd55a..ffab7853672 100644 --- a/cvat-ui/src/reducers/interfaces.ts +++ b/cvat-ui/src/reducers/interfaces.ts @@ -51,11 +51,7 @@ export interface ProjectsState { deletes: { [projectId: number]: boolean; // deleted (deleting if in dictionary) }; - backups: { - [projectId: number]: boolean; - } }; - //importing: boolean; } export interface TasksQuery { @@ -88,7 +84,6 @@ export interface JobsState { } export interface TasksState { - importing: boolean; initialized: boolean; fetching: boolean; updating: boolean; @@ -113,9 +108,6 @@ export interface TasksState { status: string; error: string; }; - backups: { - [tid: number]: boolean; - }; jobUpdates: { [jid: number]: boolean, }; @@ -153,9 +145,9 @@ export interface ImportResourceState { importingId: number | null; progress: number; status: string; - instance: any; + // instance: any; //resource: 'dataset' | 'annotation' | null; - modalVisible: boolean; + //modalVisible: boolean; } export interface ImportDatasetState { @@ -178,8 +170,11 @@ export interface ImportDatasetState { projects: ImportResourceState | null; tasks: ImportResourceState | null; jobs: ImportResourceState | null; - instanceType: 'project' | 'task' | 'job' | null; + //instanceType: 'project' | 'task' | 'job' | null; + importing: boolean; + instance: any; resource: any; + modalVisible: boolean; } export interface ImportBackupState { diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 37fae9bf886..70f96de708a 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -394,8 +394,52 @@ export default function (state = defaultState, action: AnyAction): Notifications exporting: { ...state.messages.exporting, dataset: - `Dataset for resource ${instance.id} have been ${(isLocal) ? "downloaded" : "uploaded"} ${(isLocal) ? "locally" : "to cloud storage"}`, - // `task ${taskID}`, + `Dataset for resource ${instance.id} has been ${(isLocal) ? "downloaded" : "uploaded"} ${(isLocal) ? "locally" : "to cloud storage"}`, + }, + }, + }; + } + case ExportActionTypes.EXPORT_BACKUP_FAILED: { + const { instanceId, instanceType} = action.payload; + return { + ...state, + errors: { + ...state.errors, + exporting: { + ...state.errors.exporting, + backup: { + message: + `Could not export the ${instanceType} №${instanceId}`, + reason: action.payload.error.toString(), + }, + }, + }, + }; + } + case ExportActionTypes.EXPORT_BACKUP_SUCCESS: { + const { instanceId, instanceType, isLocal } = action.payload; + return { + ...state, + messages: { + ...state.messages, + exporting: { + ...state.messages.exporting, + backup: + `Backup for the ${instanceType} №${instanceId} has been ${(isLocal) ? "downloaded" : "uploaded"} ${(isLocal) ? "locally" : "to cloud storage"}`, + }, + }, + }; + } + case ImportActionTypes.IMPORT_DATASET_SUCCESS: { + const { instance, resource } = action.payload; + return { + ...state, + messages: { + ...state.messages, + importing: { + ...state.messages.importing, + [resource]: + `The ${resource} for resource ${instance.id} has been uploaded`, }, }, }; @@ -420,7 +464,7 @@ export default function (state = defaultState, action: AnyAction): Notifications }; } case ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS: { - const { instance } = action.payload; + const { instanceId, instanceType } = action.payload; return { ...state, messages: { @@ -428,12 +472,14 @@ export default function (state = defaultState, action: AnyAction): Notifications importing: { ...state.messages.importing, backup: - `The ${instance.name} ${instance.id} has been restored successfully`, + `The ${instanceType} has been restored succesfully. + Click here to open`, }, }, }; } case ImportBackupActionTypes.IMPORT_BACKUP_FAILED: { + const { instanceType } = action.payload; return { ...state, errors: { @@ -442,7 +488,7 @@ export default function (state = defaultState, action: AnyAction): Notifications ...state.errors.importing, backup: { message: - 'Could not restore backup ', + `Could not restore ${instanceType} backup.`, reason: action.payload.error.toString(), }, }, @@ -550,49 +596,6 @@ export default function (state = defaultState, action: AnyAction): Notifications }, }; } - case TasksActionTypes.EXPORT_TASK_FAILED: { - return { - ...state, - errors: { - ...state.errors, - tasks: { - ...state.errors.tasks, - exporting: { - message: 'Could not export the task', - reason: action.payload.error.toString(), - }, - }, - }, - }; - } - case TasksActionTypes.IMPORT_TASK_FAILED: { - return { - ...state, - errors: { - ...state.errors, - tasks: { - ...state.errors.tasks, - importing: { - message: 'Could not import the task', - reason: action.payload.error.toString(), - }, - }, - }, - }; - } - case TasksActionTypes.IMPORT_TASK_SUCCESS: { - const taskID = action.payload.task.id; - return { - ...state, - messages: { - ...state.messages, - tasks: { - ...state.messages.tasks, - importingDone: `Task has been imported succesfully Open task`, - }, - }, - }; - } case TasksActionTypes.UPDATE_JOB_FAILED: { const jobID = action.payload.jobInstance.id; return { @@ -679,51 +682,6 @@ export default function (state = defaultState, action: AnyAction): Notifications }, }; } - case ProjectsActionTypes.BACKUP_PROJECT_FAILED: { - return { - ...state, - errors: { - ...state.errors, - projects: { - ...state.errors.projects, - backuping: { - message: `Could not backup the project #${action.payload.projectId}`, - reason: action.payload.error.toString(), - }, - }, - }, - }; - } - case ProjectsActionTypes.RESTORE_PROJECT_FAILED: { - return { - ...state, - errors: { - ...state.errors, - projects: { - ...state.errors.projects, - restoring: { - message: 'Could not restore the project', - reason: action.payload.error.toString(), - }, - }, - }, - }; - } - case ProjectsActionTypes.RESTORE_PROJECT_SUCCESS: { - const { projectID } = action.payload; - return { - ...state, - messages: { - ...state.messages, - projects: { - ...state.messages.projects, - restoringDone: - `Project has been created succesfully. - Click here to open`, - }, - }, - }; - } case FormatsActionTypes.GET_FORMATS_FAILED: { return { ...state, diff --git a/cvat-ui/src/reducers/projects-reducer.ts b/cvat-ui/src/reducers/projects-reducer.ts index 0eeb9f262c8..77eae944630 100644 --- a/cvat-ui/src/reducers/projects-reducer.ts +++ b/cvat-ui/src/reducers/projects-reducer.ts @@ -3,7 +3,6 @@ // SPDX-License-Identifier: MIT import { AnyAction } from 'redux'; -import { omit } from 'lodash'; import { ProjectsActionTypes } from 'actions/projects-actions'; import { BoundariesActionTypes } from 'actions/boundaries-actions'; import { AuthActionTypes } from 'actions/auth-actions'; @@ -37,9 +36,7 @@ const defaultState: ProjectsState = { id: null, error: '', }, - backups: {}, }, - importing: false, }; export default (state: ProjectsState = defaultState, action: AnyAction): ProjectsState => { @@ -204,48 +201,6 @@ export default (state: ProjectsState = defaultState, action: AnyAction): Project }, }; } - case ProjectsActionTypes.BACKUP_PROJECT: { - const { projectId } = action.payload; - const { backups } = state.activities; - - return { - ...state, - activities: { - ...state.activities, - backups: { - ...backups, - ...Object.fromEntries([[projectId, true]]), - }, - }, - }; - } - case ProjectsActionTypes.BACKUP_PROJECT_FAILED: - case ProjectsActionTypes.BACKUP_PROJECT_SUCCESS: { - const { projectID } = action.payload; - const { backups } = state.activities; - - return { - ...state, - activities: { - ...state.activities, - backups: omit(backups, [projectID]), - }, - }; - } - case ProjectsActionTypes.RESTORE_PROJECT: { - return { - ...state, - importing: true, - }; - } - case ProjectsActionTypes.RESTORE_PROJECT_FAILED: - case ProjectsActionTypes.RESTORE_PROJECT_SUCCESS: { - return { - ...state, - importing: false, - }; - } - case BoundariesActionTypes.RESET_AFTER_ERROR: case AuthActionTypes.LOGOUT_SUCCESS: { return { ...defaultState }; diff --git a/cvat-ui/src/reducers/tasks-reducer.ts b/cvat-ui/src/reducers/tasks-reducer.ts index c9d1d8e01ac..34228938678 100644 --- a/cvat-ui/src/reducers/tasks-reducer.ts +++ b/cvat-ui/src/reducers/tasks-reducer.ts @@ -38,10 +38,8 @@ const defaultState: TasksState = { status: '', error: '', }, - backups: {}, jobUpdates: {}, }, - importing: false, }; export default (state: TasksState = defaultState, action: AnyAction): TasksState => { @@ -164,49 +162,6 @@ export default (state: TasksState = defaultState, action: AnyAction): TasksState }, }; } - case TasksActionTypes.EXPORT_TASK: { - const { taskID } = action.payload; - const { backups } = state.activities; - - return { - ...state, - activities: { - ...state.activities, - backups: { - ...backups, - ...Object.fromEntries([[taskID, true]]), - }, - }, - }; - } - case TasksActionTypes.EXPORT_TASK_FAILED: - case TasksActionTypes.EXPORT_TASK_SUCCESS: { - const { taskID } = action.payload; - const { backups } = state.activities; - - delete backups[taskID]; - - return { - ...state, - activities: { - ...state.activities, - backups: omit(backups, [taskID]), - }, - }; - } - case TasksActionTypes.IMPORT_TASK: { - return { - ...state, - importing: true, - }; - } - case TasksActionTypes.IMPORT_TASK_FAILED: - case TasksActionTypes.IMPORT_TASK_SUCCESS: { - return { - ...state, - importing: false, - }; - } case TasksActionTypes.CREATE_TASK: { return { ...state, From 8bf2d3f6a8e659bd36fc4a2f34f9fe57258a34c1 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 5 Aug 2022 10:25:07 +0200 Subject: [PATCH 03/60] Refactoring && fixed several bugs --- cvat-ui/src/actions/import-actions.ts | 9 +- cvat-ui/src/actions/import-backup-actions.ts | 8 +- cvat-ui/src/actions/tasks-actions.ts | 11 +-- .../create-project-content.tsx | 67 +++++++------ .../advanced-configuration-form.tsx | 87 +++++++---------- .../export-backup/export-backup-modal.tsx | 50 +++++----- .../export-dataset/export-dataset-modal.tsx | 31 +++--- .../import-backup/import-backup-modal.tsx | 46 ++++++--- .../import-dataset/import-dataset-modal.tsx | 69 ++++++++++--- .../import-dataset-status-modal.tsx | 22 ++++- .../select-cloud-storage.tsx | 2 +- .../storage/source-storage-field.tsx | 47 +++++++++ .../{storage.tsx => storage-field.tsx} | 36 +++---- .../src/components/storage/storage-form.tsx | 73 -------------- .../storage/storage-with-switch-field.tsx | 96 +++++++++++++++++++ .../storage/target-storage-field.tsx | 47 +++++++++ .../containers/actions-menu/actions-menu.tsx | 25 ++--- .../top-bar/annotation-menu.tsx | 8 +- cvat-ui/src/reducers/import-backup-reducer.ts | 4 +- 19 files changed, 454 insertions(+), 284 deletions(-) create mode 100644 cvat-ui/src/components/storage/source-storage-field.tsx rename cvat-ui/src/components/storage/{storage.tsx => storage-field.tsx} (73%) delete mode 100644 cvat-ui/src/components/storage/storage-form.tsx create mode 100644 cvat-ui/src/components/storage/storage-with-switch-field.tsx create mode 100644 cvat-ui/src/components/storage/target-storage-field.tsx diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 823a323d828..7b673d162e5 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -51,7 +51,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett if (instance instanceof core.classes.Project) { // TODO change importingId - if (state.import.instance !== null) { + if (state.import.projects?.activities[instance.id]) { throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); @@ -59,19 +59,18 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else if (instance instanceof core.classes.Task) { - if (state.import.instance !== null) { + if (state.import.tasks?.activities[instance.id]) { throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); - // await task.annotations.upload(file, loader); await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else { // job - if (state.import.tasks[instance.taskId]) { + if (state.import.tasks?.activities[instance.taskId]) { throw Error('Annotations is being uploaded for the task'); } - if (state.import.jobs[instance.id]) { + if (state.import.jobs?.activities[instance.id]) { throw Error('Only one uploading of annotations for a job allowed at the same time'); } const { filters, showAllInterpolationTracks } = receiveAnnotationsParameters(); diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index 782e4a0ad13..cdf03a59c45 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -11,8 +11,8 @@ import getCore from 'cvat-core-wrapper'; const core = getCore(); export enum ImportBackupActionTypes { - OPEN_IMPORT_MODAL = 'OPEN_IMPORT_MODAL', - CLOSE_IMPORT_MODAL = 'CLOSE_IMPORT_MODAL', + OPEN_IMPORT_BACKUP_MODAL = 'OPEN_IMPORT_BACKUP_MODAL', + CLOSE_IMPORT_BACKUP_MODAL = 'CLOSE_IMPORT_BACKUP_MODAL', IMPORT_BACKUP = 'IMPORT_BACKUP', IMPORT_BACKUP_SUCCESS = 'IMPORT_BACKUP_SUCCESS', IMPORT_BACKUP_FAILED = 'IMPORT_BACKUP_FAILED', @@ -20,9 +20,9 @@ export enum ImportBackupActionTypes { export const importBackupActions = { openImportModal: (instanceType: 'project' | 'task' | null) => ( - createAction(ImportBackupActionTypes.OPEN_IMPORT_MODAL, { instanceType }) + createAction(ImportBackupActionTypes.OPEN_IMPORT_BACKUP_MODAL, { instanceType }) ), - closeImportModal: () => createAction(ImportBackupActionTypes.CLOSE_IMPORT_MODAL), + closeImportModal: () => createAction(ImportBackupActionTypes.CLOSE_IMPORT_BACKUP_MODAL), importBackup: () => createAction(ImportBackupActionTypes.IMPORT_BACKUP), importBackupSuccess: (instanceId: number, instanceType: 'project' | 'task') => ( createAction(ImportBackupActionTypes.IMPORT_BACKUP_SUCCESS, { instanceId, instanceType }) diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index fdbaa45efa4..cf7e9ec28fa 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -255,15 +255,8 @@ export function createTaskAsync(data: any): ThunkAction, {}, {}, A use_zip_chunks: data.advanced.useZipChunks, use_cache: data.advanced.useCache, sorting_method: data.advanced.sortingMethod, - // TODO: maybe need to move it to optional block - source_storage: { - location: data.advanced.sourceStorage.location, - cloud_storage_id: data.advanced.sourceStorage.cloudStorageId, - }, - target_storage: { - location: data.advanced.targetStorage.location, - cloud_storage_id: data.advanced.targetStorage.cloudStorageId, - }, + source_storage: data.advanced.sourceStorage, + target_storage: data.advanced.targetStorage, }; if (data.projectId) { diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index 52966ee4f54..d2814870f58 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -22,14 +22,34 @@ import { CombinedState } from 'reducers/interfaces'; import LabelsEditor from 'components/labels-editor/labels-editor'; import { createProjectAsync } from 'actions/projects-actions'; import CreateProjectContext from './create-project.context'; -import { StorageLocation, StorageState } from 'reducers/interfaces'; +import { StorageLocation } from 'reducers/interfaces'; import CVATTooltip from 'components/common/cvat-tooltip'; -import StorageField from 'components/storage/storage'; -import StorageForm from 'components/storage/storage-form'; + import Space from 'antd/lib/space'; +import SourceStorageField from 'components/storage/source-storage-field'; +import TargetStorageField from 'components/storage/target-storage-field'; + const { Option } = Select; +interface AdvancedConfiguration { + sourceStorage: any; + targetStorage: any; + bug_tracker?: string | null; +} + +const initialValues: AdvancedConfiguration = { + bug_tracker: null, + sourceStorage: { + location: StorageLocation.LOCAL, + cloud_storage_id: null, + }, + targetStorage: { + location: StorageLocation.LOCAL, + cloud_storage_id: null, + }, +}; + function NameConfigurationForm({ formRef }: { formRef: RefObject }): JSX.Element { return (
@@ -105,14 +125,16 @@ function AdaptiveAutoAnnotationForm({ formRef }: { formRef: RefObject; - sourceStorageFormRef: RefObject; - targetStorageFormRef: RefObject; } function AdvancedConfigurationForm(props: AdvancedConfigurationFormProps): JSX.Element { - const { formRef, sourceStorageFormRef, targetStorageFormRef } = props; + const { formRef } = props; return ( - + - console.log(value)} /> - console.log(value)} /> @@ -162,8 +180,6 @@ export default function CreateProjectContent(): JSX.Element { const nameFormRef = useRef(null); const adaptiveAutoAnnotationFormRef = useRef(null); const advancedFormRef = useRef(null); - const sourceStorageFormRef = useRef(null); - const targetStorageFormRef = useRef(null); const dispatch = useDispatch(); const history = useHistory(); @@ -178,8 +194,7 @@ export default function CreateProjectContent(): JSX.Element { // Clear new project forms if (nameFormRef.current) nameFormRef.current.resetFields(); if (advancedFormRef.current) advancedFormRef.current.resetFields(); - sourceStorageFormRef.current?.resetFields(); - targetStorageFormRef.current?.resetFields(); + setProjectLabels([]); notification.info({ @@ -197,16 +212,12 @@ export default function CreateProjectContent(): JSX.Element { if (nameFormRef.current && advancedFormRef.current) { const basicValues = await nameFormRef.current.validateFields(); const advancedValues = await advancedFormRef.current.validateFields(); - const sourceStorageValues = await sourceStorageFormRef.current?.validateFields(); - const targetStorageValues = await targetStorageFormRef.current?.validateFields(); - let sourceStorage = { - location: sourceStorageValues['location'] || StorageLocation.LOCAL, - cloud_storage_id: sourceStorageValues['cloudStorageId'] || null, + const sourceStorage = { + ...advancedValues.sourceStorage }; - let targetStorage = { - location: targetStorageValues['location'] ||StorageLocation.LOCAL, - cloud_storage_id: targetStorageValues['cloudStorageId'] || null, + const targetStorage = { + ...advancedValues.targetStorage }; const adaptiveAutoAnnotationValues = await adaptiveAutoAnnotationFormRef.current?.validateFields(); @@ -252,11 +263,7 @@ export default function CreateProjectContent(): JSX.Element { Advanced configuration}> - + diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 29b6d13b40e..af22ae890a0 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -15,9 +15,11 @@ import Text from 'antd/lib/typography/Text'; import { Store } from 'antd/lib/form/interface'; import CVATTooltip from 'components/common/cvat-tooltip'; import patterns from 'utils/validation-patterns'; -import { StorageLocation, StorageState } from 'reducers/interfaces'; +import { StorageLocation } from 'reducers/interfaces'; -import StorageForm from 'components/storage/storage-form'; +// import StorageForm from 'components/storage/storage-form'; +import SourceStorageField from 'components/storage/source-storage-field'; +import TargetStorageField from 'components/storage/target-storage-field'; import getCore from 'cvat-core-wrapper'; @@ -50,8 +52,8 @@ export interface AdvancedConfiguration { sortingMethod: SortingMethod; useProjectSourceStorage: boolean | null; useProjectTargetStorage: boolean | null; - sourceStorage?: StorageState; - targetStorage?: StorageState; + sourceStorage: any; + targetStorage: any; } const initialValues: AdvancedConfiguration = { @@ -61,16 +63,16 @@ const initialValues: AdvancedConfiguration = { useCache: true, copyData: false, sortingMethod: SortingMethod.LEXICOGRAPHICAL, - useProjectSourceStorage: null, - useProjectTargetStorage: null, + useProjectSourceStorage: true, + useProjectTargetStorage: true, sourceStorage: { location: StorageLocation.LOCAL, - cloudStorageId: null, + cloud_storage_id: null, }, targetStorage: { location: StorageLocation.LOCAL, - cloudStorageId: null, + cloud_storage_id: null, } }; @@ -167,14 +169,10 @@ const validateStopFrame: RuleRender = ({ getFieldValue }): RuleObject => ({ class AdvancedConfigurationForm extends React.PureComponent { private formRef: RefObject; - private sourceStorageFormRef: RefObject; - private targetStorageFormRef: RefObject; public constructor(props: Props) { super(props); this.formRef = React.createRef(); - this.sourceStorageFormRef = React.createRef(); - this.targetStorageFormRef = React.createRef(); } public submit(): Promise { @@ -183,51 +181,41 @@ class AdvancedConfigurationForm extends React.PureComponent { return this.formRef.current.validateFields().then( (values: Store): Promise => { const frameFilter = values.frameStep ? `step=${values.frameStep}` : undefined; - - // TODO need to refactor this one - // TODO add validation form for source and target storages - // tODO use this - // const values = await advancedFormRef.current.validateFields(); let sourceStorage; let targetStorage; + + const useProjectSourceStorage = values.useProjectSourceStorage; + const useProjectTargetStorage = values.useProjectTargetStorage; + if (!!projectId) { let projectSourceStorage; let projectTargetStorage; - core.projects.get({ id: projectId }).then((response: any) => { - if (response.length) { - const [project] = response; - projectSourceStorage = project.sourceStorage; - projectTargetStorage = project.targetStorage; - } - }); - - const useProjectSourceStorage = values.useProjectSourceStorage; - const useProjectTargetStorage = values.useProjectTargetStorage; + + if (useProjectSourceStorage || useProjectTargetStorage) { + core.projects.get({ id: projectId }).then((response: any) => { + if (response.length) { + const [project] = response; + projectSourceStorage = project.sourceStorage; + projectTargetStorage = project.targetStorage; + } + }); + } + if (useProjectSourceStorage) { sourceStorage = projectSourceStorage; - } else { - sourceStorage = { - location: this.sourceStorageFormRef.current?.getFieldValue('location'), - cloudStorageId: this.sourceStorageFormRef.current?.getFieldValue('cloudStorageId'), - } } if (useProjectTargetStorage) { targetStorage = projectTargetStorage; - } else { - targetStorage = { - location: this.targetStorageFormRef.current?.getFieldValue('location'), - cloudStorageId: this.targetStorageFormRef.current?.getFieldValue('cloudStorageId'), - } } - } else { + } + if (!projectId || !useProjectSourceStorage) { sourceStorage = { - location: this.sourceStorageFormRef.current?.getFieldValue('location'), - cloudStorageId: this.sourceStorageFormRef.current?.getFieldValue('cloudStorageId'), + ...values.sourceStorage, } - + } + if (!projectId || !useProjectTargetStorage) { targetStorage = { - location: this.targetStorageFormRef.current?.getFieldValue('location'), - cloudStorageId: this.targetStorageFormRef.current?.getFieldValue('cloudStorageId'), + ...values.targetStorage, } } @@ -250,11 +238,11 @@ class AdvancedConfigurationForm extends React.PureComponent { } public resetFields(): void { + // useProjectSourceStorage(true); + // useProjectTargetStorage(true); if (this.formRef.current) { this.formRef.current.resetFields(); } - this.sourceStorageFormRef.current?.resetFields(); - this.targetStorageFormRef.current?.resetFields(); } /* eslint-disable class-methods-use-this */ @@ -524,10 +512,8 @@ class AdvancedConfigurationForm extends React.PureComponent { onChangeUseProjectSourceStorage, } = this.props; return ( - { onChangeUseProjectTargetStorage, } = this.props; return ( - console.log(value)} onChangeUseProjectStorage={onChangeUseProjectTargetStorage} - /> ); } diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index 4f683203718..2527f723776 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -19,14 +19,26 @@ import getCore from 'cvat-core-wrapper'; import Switch from 'antd/lib/switch'; import { Space } from 'antd'; -import StorageForm from 'components/storage/storage-form'; +import TargetStorageField from 'components/storage/target-storage-field'; const core = getCore(); type FormValues = { customName: string | undefined; + targetStorage: any; + useProjectTargetStorage: boolean; }; +const initialValues: FormValues = { + customName: undefined, + targetStorage: { + location: undefined, + cloud_storage_id: undefined, + //cloudStorageId: undefined, + }, + useProjectTargetStorage: true, +} + function ExportBackupModal(): JSX.Element | null { const dispatch = useDispatch(); @@ -38,9 +50,7 @@ function ExportBackupModal(): JSX.Element | null { const [useDefaultStorage, setUseDefaultStorage] = useState(true); const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); - const [storage, setStorage] = useState(null); - - const storageForm = React.createRef(); + // const [storage, setStorage] = useState(null); const [helpMessage, setHelpMessage] = useState(''); const resource = useSelector((state: CombinedState) => state.export.resource); @@ -88,7 +98,7 @@ function ExportBackupModal(): JSX.Element | null { }, [defaultStorageLocation, defaultStorageCloudId]); const closeModal = (): void => { - storageForm.current?.resetFields(); + setUseDefaultStorage(true); form.resetFields(); dispatch(exportActions.closeExportModal()); }; @@ -100,8 +110,8 @@ function ExportBackupModal(): JSX.Element | null { instance, values.customName ? `${values.customName}.zip` : '', (useDefaultStorage) ? null : { - location: storage?.location, - cloudStorageId: storage?.cloudStorageId, + location: values.targetStorage?.location, + cloudStorageId: values.targetStorage?.cloud_storage_id, } as Storage, ), ); @@ -114,19 +124,19 @@ function ExportBackupModal(): JSX.Element | null { className: `cvat-notification-notice-export-backup-start`, }); }, - [instance, instanceType, storage], + [instance, instanceType, useDefaultStorage], ); - const onChangeStorage = (value: Storage): void => { - setStorage({ - ...value, - } as Storage) - } + // const onChangeStorage = (value: Storage): void => { + // setStorage({ + // ...value, + // } as Storage) + // } if (resource !== 'backup') return null; return ( - // TODO add pending on submit buttom + // TODO add pending on submit button {`Export ${instanceType}`}} visible={modalVisible} @@ -141,11 +151,7 @@ function ExportBackupModal(): JSX.Element | null { layout='vertical' // labelCol={{ span: 8 }} // wrapperCol={{ span: 16 }} - initialValues={ - { - customName: undefined, - } as FormValues - } + initialValues={initialValues} onFinish={handleExport} > {/* wrapperCol={{ offset: 8, span: 16 }} */} @@ -158,17 +164,15 @@ function ExportBackupModal(): JSX.Element | null { className='cvat-modal-export-filename-input' /> - setUseDefaultStorage(value)} - onChangeStorage={(value: Storage) => onChangeStorage(value)} + onChangeStorage={(value: Storage) => console.log(value)} /> diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index eeeb5a3a08e..067b27997c5 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -20,7 +20,8 @@ import getCore from 'cvat-core-wrapper'; import Switch from 'antd/lib/switch'; import { Space } from 'antd'; -import StorageForm from 'components/storage/storage-form'; +// import StorageForm from 'components/storage/storage-form'; +import TargetStorageField from 'components/storage/target-storage-field'; const core = getCore(); @@ -28,14 +29,26 @@ type FormValues = { selectedFormat: string | undefined; saveImages: boolean; customName: string | undefined; + targetStorage: any; + useProjectTargetStorage: boolean; }; +const initialValues: FormValues = { + selectedFormat: undefined, + saveImages: false, + customName: undefined, + targetStorage: { + location: undefined, + cloud_storage_id: undefined, + }, + useProjectTargetStorage: true, +} + function ExportDatasetModal(): JSX.Element | null { const [instanceType, setInstanceType] = useState(''); const [activities, setActivities] = useState([]); const [useDefaultTargetStorage, setUseDefaultTargetStorage] = useState(true); const [form] = Form.useForm(); - const targetStorageForm = React.createRef(); const [targetStorage, setTargetStorage] = useState(null); const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); @@ -112,7 +125,7 @@ function ExportDatasetModal(): JSX.Element | null { }, [defaultStorageLocation, defaultStorageCloudId]); const closeModal = (): void => { - targetStorageForm.current?.resetFields(); + setUseDefaultTargetStorage(true); form.resetFields(); dispatch(exportActions.closeExportModal()); }; @@ -167,13 +180,7 @@ function ExportDatasetModal(): JSX.Element | null { layout='vertical' // labelCol={{ span: 8 }} // wrapperCol={{ span: 16 }} - initialValues={ - { - selectedFormat: undefined, - saveImages: false, - customName: undefined, - } as FormValues - } + initialValues={initialValues} onFinish={handleExport} > - (null); const instanceType = useSelector((state: CombinedState) => state.importBackup?.instanceType); @@ -73,9 +80,24 @@ function ImportBackupModal(): JSX.Element | null { ); }; + const validateFileName = (_: RuleObject, value: string): Promise => { + if (value) { + const extension = value.toLowerCase().split('.')[1]; + if (extension !== 'zip') { + return Promise.reject(new Error('Only ZIP archive is supported')); + } + } + + return Promise.resolve(); + } + const renderCustomName = (): JSX.Element => { return ( - File name} name='fileName'> + File name} + name='fileName' + rules={[{ validator: validateFileName }]} + > { @@ -116,9 +138,6 @@ function ImportBackupModal(): JSX.Element | null { [instanceType, file], ); - if (!instanceType) { - return null; - } return ( <> @@ -134,10 +153,11 @@ function ImportBackupModal(): JSX.Element | null { form={form} onFinish={handleImport} layout='vertical' + initialValues={initialValues} > - setSelectedSourceStorage(value)} /> {selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 62b365f2a93..fef3b5d7145 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -6,7 +6,7 @@ import './styles.scss'; import React, { useCallback, useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import Modal from 'antd/lib/modal'; -import Form from 'antd/lib/form'; +import Form, { RuleObject } from 'antd/lib/form'; import Text from 'antd/lib/typography/Text'; import Select from 'antd/lib/select'; import Notification from 'antd/lib/notification'; @@ -29,7 +29,7 @@ import Switch from 'antd/lib/switch'; import Tooltip from 'antd/lib/tooltip'; import getCore from 'cvat-core-wrapper'; -import StorageField from 'components/storage/storage'; +import StorageField from 'components/storage/storage-field'; import { Storage } from 'reducers/interfaces'; import Input from 'antd/lib/input/Input'; @@ -40,11 +40,21 @@ const core = getCore(); type FormValues = { selectedFormat: string | undefined; - location?: string | undefined; - cloudStorageId?: number | undefined; fileName?: string | undefined; + sourceStorage: any; + useDefaultSettings: boolean; }; +const initialValues: FormValues = { + selectedFormat: undefined, + fileName: undefined, + sourceStorage: { + location: StorageLocation.LOCAL, + cloud_storage_id: undefined, + }, + useDefaultSettings: true, +} + interface UploadParams { resource: 'annotation' | 'dataset' | null; useDefaultSettings: boolean; @@ -133,7 +143,7 @@ function ImportDatasetModal(): JSX.Element | null { accept='.zip,.json,.xml' beforeUpload={(_file: RcFile): boolean => { if (!selectedLoader) { - message.warn('Please select a format first'); + message.warn('Please select a format first', 3); } else if (isDataset() && !['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { message.error('Only ZIP archive is supported for import a dataset'); } else if (isAnnotation() && @@ -156,9 +166,38 @@ function ImportDatasetModal(): JSX.Element | null { ); }; + const validateFileName = (_: RuleObject, value: string): Promise => { + if (!selectedLoader) { + message.warn('Please select a format first', 3); + return Promise.reject(); + } + if (value) { + const extension = value.toLowerCase().split('.')[1]; + if (isAnnotation()) { + const allowedExtensions = selectedLoader.format.toLowerCase().split(', ') + if (!allowedExtensions.includes(extension)) { + return Promise.reject(new Error(`For ${selectedLoader.name} format only files with ${selectedLoader.format.toLowerCase()} extension can be used`)); + } + } + if (isDataset()) { + if (extension !== 'zip') { + return Promise.reject(new Error('Only ZIP archive is supported for import a dataset')); + } + } + } + + return Promise.resolve(); + } + const renderCustomName = (): JSX.Element => { return ( - File name} name='fileName'> + File name} + name='fileName' + hasFeedback + dependencies={['selectedFormat']} + rules={[{ validator: validateFileName }]} + > { + setUseDefaultSettings(true); form.resetFields(); setFile(null); dispatch(importActions.closeImportModal(instance)); }, [form, instance]); - const onUpload = () => { + const onUpload = useCallback(() => { if (uploadParams && uploadParams.resource) { dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, @@ -186,7 +226,7 @@ function ImportDatasetModal(): JSX.Element | null { className: `cvat-notification-notice-import-${uploadParams.resource}-start`, }); } - } + }, [uploadParams]); const confirmUpload = () => { confirm({ @@ -214,8 +254,8 @@ function ImportDatasetModal(): JSX.Element | null { } const fileName = values.fileName || null; const sourceStorage = { - location: (values.location) ? values.location : defaultStorageLocation, - cloudStorageId: (values.location) ? values.cloudStorageId : defaultStorageCloudId, + location: (values.sourceStorage.location) ? values.sourceStorage.location : defaultStorageLocation, + cloudStorageId: (values.sourceStorage.location) ? values.sourceStorage.cloudStorageId : defaultStorageCloudId, } as Storage; setUploadParams({ @@ -265,7 +305,7 @@ function ImportDatasetModal(): JSX.Element | null {
@@ -273,6 +313,7 @@ function ImportDatasetModal(): JSX.Element | null { name='selectedFormat' label='Import format' rules={[{ required: true, message: 'Format must be selected' }]} + hasFeedback > setLocationValue(location)} + onClear={() => setLocationValue(StorageLocation.LOCAL)} + allowClear > - {locationValue === StorageLocation.CLOUD_STORAGE && renderCloudStorageId()} + {locationValue === StorageLocation.CLOUD_STORAGE && renderCloudStorage()} ); } diff --git a/cvat-ui/src/components/storage/storage-form.tsx b/cvat-ui/src/components/storage/storage-form.tsx deleted file mode 100644 index 2fc55b0dc21..00000000000 --- a/cvat-ui/src/components/storage/storage-form.tsx +++ /dev/null @@ -1,73 +0,0 @@ -// (C) 2022 CVAT.ai Corporation -// -// SPDX-License-Identifier: MIT - -import './styles.scss'; -import React, { RefObject, useState } from 'react'; -import Form, { FormInstance } from 'antd/lib/form'; - -import Text from 'antd/lib/typography/Text'; -import Space from 'antd/lib/space'; -import Switch from 'antd/lib/switch'; -import StorageField from './storage'; -import { Storage, StorageLocation } from 'reducers/interfaces'; -import Tooltip from 'antd/lib/tooltip'; -import { QuestionCircleOutlined } from '@ant-design/icons'; - - -export interface Props { - formRef: RefObject; - projectId: number | null; - storageLabel: string; - switchDescription?: string; - switchHelpMessage?: string; - storageDescription?: string; - useProjectStorage?: boolean | null; - onChangeStorage: (values: Storage) => void; - onChangeUseProjectStorage?: (value: boolean) => void; -} - -const initialValues: any = { - location: StorageLocation.LOCAL, - cloudStorageId: null, -}; - -export default function StorageForm(props: Props): JSX.Element { - const { formRef, projectId, switchDescription, switchHelpMessage, storageDescription, useProjectStorage, storageLabel, onChangeUseProjectStorage, onChangeStorage, - } = props; - - - return ( - - { !!projectId && - - - { - if (onChangeUseProjectStorage) { - onChangeUseProjectStorage(value) - } - }} - /> - - {switchDescription} - {(switchHelpMessage) ? - - : null} - } - - {(!projectId || !useProjectStorage) && } - - ); -} diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx new file mode 100644 index 00000000000..4264f5358ed --- /dev/null +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -0,0 +1,96 @@ +// (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +import './styles.scss'; +import React, { RefObject, useState } from 'react'; +import Form, { FormInstance } from 'antd/lib/form'; + +import Text from 'antd/lib/typography/Text'; +import Space from 'antd/lib/space'; +import Switch from 'antd/lib/switch'; +import StorageField from './storage-field'; +import { Storage, StorageLocation } from 'reducers/interfaces'; +import Tooltip from 'antd/lib/tooltip'; +import { QuestionCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'; +import CVATTooltip from 'components/common/cvat-tooltip'; + +export interface Props { + projectId: number | null; + storageName: string; + storageLabel: string; + switchName: string; + switchDescription?: string; + switchHelpMessage?: string; + storageDescription?: string; + useProjectStorage?: boolean | null; + onChangeStorage: (values: Storage) => void; + onChangeUseProjectStorage?: (value: boolean) => void; +} + + +export default function StorageWithSwitchField(props: Props): JSX.Element { + const { + projectId, + storageName, + storageLabel, + switchName, + switchDescription, + switchHelpMessage, + storageDescription, + useProjectStorage, + onChangeUseProjectStorage, + onChangeStorage, + } = props; + + return ( + <> + { + !!projectId && + + + { + if (onChangeUseProjectStorage) { + onChangeUseProjectStorage(value) + } + }} + /> + + {switchDescription} + {(switchHelpMessage) ? + + : null} + + } + { + (!projectId || !useProjectStorage) && + + + {storageLabel} + + + + + + )} + > + + + } + + ); +} diff --git a/cvat-ui/src/components/storage/target-storage-field.tsx b/cvat-ui/src/components/storage/target-storage-field.tsx new file mode 100644 index 00000000000..a1a2e59aadf --- /dev/null +++ b/cvat-ui/src/components/storage/target-storage-field.tsx @@ -0,0 +1,47 @@ +// (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +import './styles.scss'; +import React from 'react'; +import { Storage } from 'reducers/interfaces'; + +import StorageWithSwitchField from './storage-with-switch-field'; + +export interface Props { + projectId: number | null; + switchDescription?: string; + switchHelpMessage?: string; + storageDescription?: string; + useProjectStorage?: boolean | null; + onChangeStorage: (values: Storage) => void; + onChangeUseProjectStorage?: (value: boolean) => void; +} + +export default function TargetStorageField(props: Props): JSX.Element { + const { + projectId, + switchDescription, + switchHelpMessage, + storageDescription, + useProjectStorage, + onChangeUseProjectStorage, + onChangeStorage, + } = props; + + + return ( + + ); +} diff --git a/cvat-ui/src/containers/actions-menu/actions-menu.tsx b/cvat-ui/src/containers/actions-menu/actions-menu.tsx index c599851b464..7e2d092fe45 100644 --- a/cvat-ui/src/containers/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/containers/actions-menu/actions-menu.tsx @@ -18,6 +18,7 @@ import { } from 'actions/tasks-actions'; import { exportActions } from 'actions/export-actions'; import { importActions } from 'actions/import-actions'; +import { importBackupActions } from 'actions/import-backup-actions'; interface OwnProps { taskInstance: any; @@ -33,7 +34,7 @@ interface StateToProps { interface DispatchToProps { loadAnnotations: (taskInstance: any, loader: any, file: File) => void; showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null) => void; - showImportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null) => void; + showImportModal: (taskInstance: any, isDataset: boolean) => void; // showExportBackupModal: (taskInstance: any) => void; openRunModelWindow: (taskInstance: any) => void; deleteTask: (taskInstance: any) => void; @@ -69,22 +70,19 @@ function mapDispatchToProps(dispatch: any): DispatchToProps { showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null): void => { dispatch(exportActions.openExportModal(taskInstance, resource)); }, - showImportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null): void => { - dispatch(importActions.openImportModal(taskInstance, 'annotation')); + showImportModal: (taskInstance: any, isDataset: boolean): void => { + if (isDataset) { + dispatch(importActions.openImportModal(taskInstance, 'annotation')); + } else { + dispatch(importBackupActions.openImportModal('task')); + } }, deleteTask: (taskInstance: any): void => { dispatch(deleteTaskAsync(taskInstance)); }, - // showExportBackupModal: (taskInstance: any): void => { - // dispatch(exportBackupActions.openExportBackupModal(taskInstance)); - // }, openRunModelWindow: (taskInstance: any): void => { dispatch(modelsActions.showRunModelDialog(taskInstance)); }, - // exportTask: (taskInstance: any): void => { - // // fixme - // // dispatch(exportTaskAsync(taskInstance)); - // }, openMoveTaskToProjectWindow: (taskId: number): void => { dispatch(switchMoveTaskModalVisible(true, taskId)); }, @@ -107,8 +105,6 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps): // exportTask, openMoveTaskToProjectWindow, } = props; - // const [isExportDatasetModalOpen, setIsExportDatasetModalOpen] = useState(false); - // const [isExportBackupModalOpen, setIsExportBackupModalOpen] = useState(false); function onClickMenu(params: MenuInfo): void | JSX.Element { const [action] = params.keyPath; @@ -122,13 +118,12 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps): openRunModelWindow(taskInstance); } else if (action === Actions.EXPORT_TASK) { showExportModal(taskInstance, 'backup'); - // exportTask(taskInstance); } else if (action === Actions.MOVE_TASK_TO_PROJECT) { openMoveTaskToProjectWindow(taskInstance.id); } else if (action === Actions.LOAD_TASK_ANNO) { - showImportModal(taskInstance, 'dataset'); + showImportModal(taskInstance, true); } else if (action === Actions.IMPORT_TASK) { - showImportModal(taskInstance, 'backup'); + showImportModal(taskInstance, false); } } diff --git a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx index c83f114e014..01d62443df5 100644 --- a/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/containers/annotation-page/top-bar/annotation-menu.tsx @@ -31,7 +31,7 @@ interface StateToProps { interface DispatchToProps { showExportModal: (jobInstance: any, resource: 'dataset' | 'backup') => void; - showImportModal: (jobInstance: any, resource: 'dataset' | 'annotation') => void; + showImportModal: (jobInstance: any) => void; removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly: boolean): void; setForceExitAnnotationFlag(forceExit: boolean): void; saveAnnotations(jobInstance: any, afterSave?: () => void): void; @@ -69,8 +69,8 @@ function mapDispatchToProps(dispatch: any): DispatchToProps { showExportModal(taskInstance: any, resource: 'dataset' | 'backup'): void { dispatch(exportActions.openExportModal(taskInstance, resource)); }, - showImportModal(taskInstance: any, resource: 'dataset' | 'annotation'): void { - dispatch(importActions.openImportModal(taskInstance, resource)); + showImportModal(jobInstance: any): void { + dispatch(importActions.openImportModal(jobInstance, 'annotation')); }, removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly:boolean) { dispatch(removeAnnotationsAsyncAction(startnumber, endnumber, delTrackKeyframesOnly)); @@ -138,7 +138,7 @@ function AnnotationMenuContainer(props: Props): JSX.Element { updateJob(jobInstance); window.location.reload(); } else if (action === Actions.LOAD_JOB_ANNO) { - showImportModal(jobInstance, 'annotation'); + showImportModal(jobInstance); } }; diff --git a/cvat-ui/src/reducers/import-backup-reducer.ts b/cvat-ui/src/reducers/import-backup-reducer.ts index 94c9e216a02..40ce318e3c4 100644 --- a/cvat-ui/src/reducers/import-backup-reducer.ts +++ b/cvat-ui/src/reducers/import-backup-reducer.ts @@ -19,13 +19,13 @@ const defaultState: ImportBackupState = { export default (state: ImportBackupState = defaultState, action: ImportBackupActions): ImportBackupState => { switch (action.type) { - case ImportBackupActionTypes.OPEN_IMPORT_MODAL: + case ImportBackupActionTypes.OPEN_IMPORT_BACKUP_MODAL: return { ...state, modalVisible: true, instanceType: action.payload.instanceType, }; - case ImportBackupActionTypes.CLOSE_IMPORT_MODAL: { + case ImportBackupActionTypes.CLOSE_IMPORT_BACKUP_MODAL: { return { ...state, modalVisible: false, From 3ddd1d047d40bb8f52c6381ff2252c35d3ec7391 Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 8 Aug 2022 15:38:56 +0200 Subject: [PATCH 04/60] Update licence headers && small fixes --- cvat-core/src/annotations.ts | 2 +- cvat-core/src/enums.ts | 1 + cvat-core/src/project-implementation.ts | 1 + cvat-core/src/project.ts | 1 + cvat-core/src/server-proxy.ts | 59 +++++------- cvat-core/src/session.ts | 15 +--- cvat-core/src/storage.ts | 27 ++---- cvat-ui/src/actions/annotation-actions.ts | 1 + cvat-ui/src/actions/export-actions.ts | 1 + cvat-ui/src/actions/import-actions.ts | 12 +-- cvat-ui/src/actions/import-backup-actions.ts | 6 +- cvat-ui/src/actions/projects-actions.ts | 1 + cvat-ui/src/actions/tasks-actions.ts | 2 +- .../components/actions-menu/actions-menu.tsx | 33 +------ .../components/actions-menu/load-submenu.tsx | 1 - .../top-bar/annotation-menu.tsx | 33 +------ .../create-project-content.tsx | 34 ++----- .../advanced-configuration-form.tsx | 31 +++---- .../create-task-page/create-task-content.tsx | 8 +- cvat-ui/src/components/cvat-app.tsx | 1 + .../export-backup/export-backup-modal.tsx | 27 +----- .../export-dataset/export-dataset-modal.tsx | 19 +--- .../file-manager/cloud-storages-tab.tsx | 47 +--------- .../import-dataset/import-dataset-modal.tsx | 89 +++++++++++++------ .../storage/source-storage-field.tsx | 2 +- .../src/components/storage/storage-field.tsx | 6 -- .../storage/storage-with-switch-field.tsx | 8 +- .../storage/target-storage-field.tsx | 2 +- cvat-ui/src/reducers/import-backup-reducer.ts | 10 +-- cvat-ui/src/reducers/import-reducer.ts | 2 +- 30 files changed, 149 insertions(+), 333 deletions(-) diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index 4d52cdf7a7f..5027c7dc465 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -270,7 +271,6 @@ if (instance instanceof Task) { result = await serverProxy.tasks.exportDataset(instance.id, format, name, saveImages, targetStorage); } else if (instance instanceof Job) { - // TODO need to check. Was serverProxy.tasks.exportDataset(instance.taskId... result = await serverProxy.jobs.exportDataset(instance.id, format, name, saveImages, targetStorage); } else { result = await serverProxy.projects.exportDataset(instance.id, format, name, saveImages, targetStorage); diff --git a/cvat-core/src/enums.ts b/cvat-core/src/enums.ts index 9f53d778071..bdb32f90e22 100644 --- a/cvat-core/src/enums.ts +++ b/cvat-core/src/enums.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index 666f6fbf442..bde49d24418 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index f8bb3afe8aa..dbe87a1f520 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index 38fb0583003..c92be4c45ba 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -15,6 +16,18 @@ return { org: config.organizationID || '' }; } + function configureStorage(useDefaultLocation: boolean | null, storage: any) { + const params: any = { use_default_location: useDefaultLocation, }; + if (!useDefaultLocation) { + params.location = storage.location; + if (storage.cloudStorageId) { + params.cloud_storage_id = storage.cloudStorageId; + } + } + + return params; + } + function removeToken() { Axios.defaults.headers.common.Authorization = ''; store.remove('token'); @@ -584,8 +597,9 @@ return async function (id, format, name, saveImages, targetStorage = null) { const { backendAPI } = config; const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; - const params: any = { + let params: any = { ...enableOrganization(), + ...configureStorage(!!targetStorage?.location, targetStorage), format, }; @@ -593,13 +607,6 @@ params.filename = name.replace(/\//g, '_'); } - params.use_default_location = !targetStorage || !targetStorage?.location; - if (!!targetStorage?.location) { - params.location = targetStorage.location; - if (targetStorage.cloudStorageId) { - params.cloud_storage_id = targetStorage.cloudStorageId; - } - } return new Promise((resolve, reject) => { async function request() { @@ -634,19 +641,13 @@ async function importDataset(id, format, useDefaultLocation, sourceStorage, file, fileName, onUpdate) { const { backendAPI, origin } = config; - const params: any = { + let params: any = { ...enableOrganization(), + ...configureStorage(useDefaultLocation, sourceStorage), format, filename: (file) ? file.name : fileName, }; - params.use_default_location = useDefaultLocation; - if (!useDefaultLocation) { - params.location = sourceStorage.location; - if (sourceStorage.cloudStorageId) { - params.cloud_storage_id = sourceStorage.cloudStorageId; - } - } const url = `${backendAPI}/projects/${id}/dataset`; @@ -726,15 +727,9 @@ const { backendAPI } = config; const params: any = { ...enableOrganization(), + ...configureStorage(!targetStorage, targetStorage), filename: fileName, - use_default_location: !targetStorage, }; - if (!!targetStorage) { - params.location = targetStorage.location; - if (targetStorage.cloudStorageId) { - params.cloud_storage_id = targetStorage.cloudStorageId; - } - } const url = `${backendAPI}/tasks/${id}/backup`; return new Promise((resolve, reject) => { @@ -836,21 +831,15 @@ return await wait(taskData, response); } - async function exportProject(id, fileName: string, targetStorage: Storage | null) { + async function exportProject(id, fileName: string, targetStorage: any) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request const params: any = { ...enableOrganization(), + ...configureStorage(!targetStorage, targetStorage), filename: fileName, - use_default_location: !targetStorage, }; - if (!!targetStorage) { - params.location = targetStorage.location; - if (targetStorage.cloudStorageId) { - params.cloud_storage_id = targetStorage.cloudStorageId; - } - } const url = `${backendAPI}/projects/${id}/backup`; return new Promise((resolve, reject) => { @@ -1430,16 +1419,10 @@ const { backendAPI, origin } = config; const params: any = { ...enableOrganization(), + ...configureStorage(useDefaultLocation, sourceStorage), format, filename: (file) ? file.name : fileName, }; - params.use_default_location = useDefaultLocation; - if (!useDefaultLocation) { - params.location = sourceStorage.location; - if (sourceStorage.cloudStorageId) { - params.cloud_storage_id = sourceStorage.cloudStorageId; - } - } const url = `${backendAPI}/${session}s/${id}/annotations`; diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 09d8924601f..04fe12c0875 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -1758,19 +1759,13 @@ /** * Source storage for import resources. * @name sourceStorage - * @type {module:API.cvat.classes.Storage} + * @type {module:API.cvat.classes.Storage} * @memberof module:API.cvat.classes.Task * @instance * @throws {module:API.cvat.exceptions.ArgumentError} */ sourceStorage: { get: () => data.source_storage, - set: (sourceStorage) => { - if (typeof sourceStorage !== Storage) { - throw new ArgumentError('Type of value must be Storage'); - } - data.source_storage = sourceStorage; - }, }, /** * Target storage for export resources. @@ -1782,12 +1777,6 @@ */ targetStorage: { get: () => data.target_storage, - set: (targetStorage) => { - if (typeof targetStorage !== Storage) { - throw new ArgumentError('Type of value must be Storage'); - } - data.target_storage = targetStorage; - }, }, _internalData: { get: () => data, diff --git a/cvat-core/src/storage.ts b/cvat-core/src/storage.ts index 05cef5eab92..11da0ed6fee 100644 --- a/cvat-core/src/storage.ts +++ b/cvat-core/src/storage.ts @@ -7,11 +7,6 @@ const { ArgumentError } = require('./exceptions'); const { StorageLocation } = require('./enums'); - interface StorageI { - location: typeof StorageLocation, - cloud_storage_id?: number, - } - /** * Class representing a storage for import and export resources * @memberof module:API.cvat.classes @@ -19,7 +14,7 @@ */ class Storage { location: typeof StorageLocation; - cloudStorageID: number; + cloudStorageId: number; constructor(initialData) { const data = { location: undefined, @@ -55,32 +50,20 @@ }, }, /** - * @name cloudStorageID + * @name cloudStorageId * @type {number} * @memberof module:API.cvat.classes.Storage * @instance */ - cloudStorageID: { + cloudStorageId: { get: () => data.cloud_storage_id, - set: (cloudStorageID) => { - data.cloud_storage_id = cloudStorageID; + set: (cloudStorageId) => { + data.cloud_storage_id = cloudStorageId; }, }, }), ); } - - toJSON() { - const object: StorageI = { - location: this.location, - }; - - if (typeof this.cloudStorageID !== 'undefined') { - object.cloud_storage_id = this.cloudStorageID; - } - - return object; - } } module.exports = { diff --git a/cvat-ui/src/actions/annotation-actions.ts b/cvat-ui/src/actions/annotation-actions.ts index 9206cec8e1f..0c928089a09 100644 --- a/cvat-ui/src/actions/annotation-actions.ts +++ b/cvat-ui/src/actions/annotation-actions.ts @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index f1fe45dcda8..105952b77aa 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 7b673d162e5..17a887ee87c 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -19,7 +20,7 @@ export enum ImportActionTypes { IMPORT_DATASET = 'IMPORT_DATASET', IMPORT_DATASET_SUCCESS = 'IMPORT_DATASET_SUCCESS', IMPORT_DATASET_FAILED = 'IMPORT_DATASET_FAILED', - IMPORT_UPDATE_STATUS = 'IMPORT_UPDATE_STATUS', + IMPORT_DATASET_UPDATE_STATUS = 'IMPORT_DATASET_UPDATE_STATUS', } export const importActions = { @@ -39,8 +40,8 @@ export const importActions = { error, }) ), - importUpdateStatus: (instance: any, progress: number, status: string) => ( - createAction(ImportActionTypes.IMPORT_UPDATE_STATUS, { instance, progress, status }) + importDatasetUpdateStatus: (instance: any, progress: number, status: string) => ( + createAction(ImportActionTypes.IMPORT_DATASET_UPDATE_STATUS, { instance, progress, status }) ), }; @@ -50,13 +51,12 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett const state: CombinedState = getState(); if (instance instanceof core.classes.Project) { - // TODO change importingId if (state.import.projects?.activities[instance.id]) { throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); await instance.annotations.importDataset(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( - dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) + dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else if (instance instanceof core.classes.Task) { if (state.import.tasks?.activities[instance.id]) { @@ -64,7 +64,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett } dispatch(importActions.importDataset(instance, format)); await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( - dispatch(importActions.importUpdateStatus(instance, Math.floor(progress * 100), message)) + dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else { // job if (state.import.tasks?.activities[instance.taskId]) { diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index cdf03a59c45..6025bd15a0f 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -1,10 +1,8 @@ -// Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; -import { CombinedState } from 'reducers/interfaces'; -import { getProjectsAsync } from './projects-actions'; import { Storage } from 'reducers/interfaces'; import getCore from 'cvat-core-wrapper'; @@ -32,7 +30,7 @@ export const importBackupActions = { ), }; -export const importBackupAsync = (instanceType: 'project' | 'task', storage: any, file: File | null, fileName: string | null): ThunkAction => ( +export const importBackupAsync = (instanceType: 'project' | 'task', storage: Storage, file: File | null, fileName: string | null): ThunkAction => ( async (dispatch) => { dispatch(importBackupActions.importBackup()); try { diff --git a/cvat-ui/src/actions/projects-actions.ts b/cvat-ui/src/actions/projects-actions.ts index 8c30cc71005..8683c58b028 100644 --- a/cvat-ui/src/actions/projects-actions.ts +++ b/cvat-ui/src/actions/projects-actions.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index fc0adfc5a08..123f83c269d 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -1,4 +1,5 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -7,7 +8,6 @@ import { ThunkAction } from 'redux-thunk'; import { TasksQuery, CombinedState, Indexable } from 'reducers/interfaces'; import { getCVATStore } from 'cvat-store'; import getCore from 'cvat-core-wrapper'; - import { getInferenceStatusAsync } from './models-actions'; const cvat = getCore(); diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx index 77aeb3232fa..ae9b65e7d6f 100644 --- a/cvat-ui/src/components/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/components/actions-menu/actions-menu.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -9,8 +10,6 @@ import Modal from 'antd/lib/modal'; import { LoadingOutlined } from '@ant-design/icons'; // eslint-disable-next-line import/no-extraneous-dependencies import { MenuInfo } from 'rc-menu/lib/interface'; - -import LoadSubmenu from './load-submenu'; import { DimensionType } from '../../reducers/interfaces'; interface Props { @@ -23,8 +22,6 @@ interface Props { inferenceIsActive: boolean; taskDimension: DimensionType; onClickMenu: (params: MenuInfo) => void; - // onUploadAnnotations: (format: string, file: File) => void; - // exportIsActive: boolean; } export enum Actions { @@ -43,12 +40,7 @@ function ActionsMenuComponent(props: Props): JSX.Element { taskID, bugTracker, inferenceIsActive, - loaders, onClickMenu, - // onUploadAnnotations, - loadActivity, - taskDimension, - // exportIsActive, } = props; const onClickMenuWrapper = useCallback( @@ -80,29 +72,6 @@ function ActionsMenuComponent(props: Props): JSX.Element { return ( - {/* {LoadSubmenu({ - loaders, - loadActivity, - onFileUpload: (format: string, file: File): void => { - if (file) { - Modal.confirm({ - title: 'Current annotation will be lost', - content: 'You are going to upload new annotations to this task. Continue?', - className: 'cvat-modal-content-load-task-annotation', - onOk: () => { - onUploadAnnotations(format, file); - }, - okButtonProps: { - type: 'primary', - danger: true, - }, - okText: 'Update', - }); - } - }, - menuKey: Actions.LOAD_TASK_ANNO, - taskDimension, - })} */} Upload annotations Export task dataset {!!bugTracker && Open bug tracker} diff --git a/cvat-ui/src/components/actions-menu/load-submenu.tsx b/cvat-ui/src/components/actions-menu/load-submenu.tsx index b12c1d11928..801ed15f9bb 100644 --- a/cvat-ui/src/components/actions-menu/load-submenu.tsx +++ b/cvat-ui/src/components/actions-menu/load-submenu.tsx @@ -23,7 +23,6 @@ export default function LoadSubmenu(props: Props): JSX.Element { menuKey, loaders, loadActivity, onFileUpload, taskDimension, } = props; - // TODO update it return ( {loaders diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx index 801db2476bf..0ae1971f6bc 100644 --- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx +++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -14,9 +15,7 @@ import Collapse from 'antd/lib/collapse'; // eslint-disable-next-line import/no-extraneous-dependencies import { MenuInfo } from 'rc-menu/lib/interface'; - import CVATTooltip from 'components/common/cvat-tooltip'; -import LoadSubmenu from 'components/actions-menu/load-submenu'; import getCore from 'cvat-core-wrapper'; import { JobStage } from 'reducers/interfaces'; @@ -24,12 +23,8 @@ const core = getCore(); interface Props { taskMode: string; - // loaders: any[]; - // dumpers: any[]; - // loadActivity: string | null; jobInstance: any; onClickMenu(params: MenuInfo): void; - // onUploadAnnotations(format: string, file: File): void; stopFrame: number; removeAnnotations(startnumber: number, endnumber: number, delTrackKeyframesOnly:boolean): void; setForceExitAnnotationFlag(forceExit: boolean): void; @@ -47,13 +42,10 @@ export enum Actions { function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Element { const { - // loaders, - // loadActivity, jobInstance, stopFrame, history, onClickMenu, - // onUploadAnnotations, removeAnnotations, setForceExitAnnotationFlag, saveAnnotations, @@ -192,29 +184,6 @@ function AnnotationMenuComponent(props: Props & RouteComponentProps): JSX.Elemen return ( onClickMenuWrapper(params)} className='cvat-annotation-menu' selectable={false}> - {/* {LoadSubmenu({ - loaders, - loadActivity, - onFileUpload: (format: string, file: File): void => { - if (file) { - Modal.confirm({ - title: 'Current annotation will be lost', - content: 'You are going to upload new annotations to this job. Continue?', - className: 'cvat-modal-content-load-job-annotation', - onOk: () => { - onUploadAnnotations(format, file); - }, - okButtonProps: { - type: 'primary', - danger: true, - }, - okText: 'Update', - }); - } - }, - menuKey: Actions.LOAD_JOB_ANNO, - taskDimension: jobInstance.dimension, - })} */} Upload annotations Export task dataset Remove annotations diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index f200823c191..e4e61e9d4a9 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -22,10 +23,6 @@ import LabelsEditor from 'components/labels-editor/labels-editor'; import { createProjectAsync } from 'actions/projects-actions'; import CreateProjectContext from './create-project.context'; import { StorageLocation } from 'reducers/interfaces'; -import CVATTooltip from 'components/common/cvat-tooltip'; - -import Space from 'antd/lib/space'; - import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -125,18 +122,9 @@ function AdaptiveAutoAnnotationForm({ formRef }: { formRef: RefObject; -} - -function AdvancedConfigurationForm(props: AdvancedConfigurationFormProps): JSX.Element { - const { formRef } = props; +function AdvancedConfigurationForm({ formRef }: { formRef: RefObject }): JSX.Element { return ( -
+ console.log(value)} /> console.log(value)} /> @@ -200,23 +186,17 @@ export default function CreateProjectContent(): JSX.Element { const submit = async (): Promise => { try { let projectData: Record = {}; - if (nameFormRef.current && advancedFormRef.current) { + if (nameFormRef.current) { const basicValues = await nameFormRef.current.validateFields(); - const advancedValues = await advancedFormRef.current.validateFields(); + const advancedValues = await advancedFormRef.current?.validateFields(); const adaptiveAutoAnnotationValues = await adaptiveAutoAnnotationFormRef.current?.validateFields(); - const sourceStorage = { - ...advancedValues.sourceStorage - }; - const targetStorage = { - ...advancedValues.targetStorage - }; projectData = { ...projectData, ...advancedValues, name: basicValues.name, - source_storage: sourceStorage, - target_storage: targetStorage, + source_storage: advancedValues?.sourceStorage, + target_storage: advancedValues?.targetStorage, }; if (adaptiveAutoAnnotationValues) { diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 8bff64ce587..9b311bdd508 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -16,8 +17,6 @@ import { Store } from 'antd/lib/form/interface'; import CVATTooltip from 'components/common/cvat-tooltip'; import patterns from 'utils/validation-patterns'; import { StorageLocation } from 'reducers/interfaces'; - -// import StorageForm from 'components/storage/storage-form'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -238,8 +237,6 @@ class AdvancedConfigurationForm extends React.PureComponent { } public resetFields(): void { - // useProjectSourceStorage(true); - // useProjectTargetStorage(true); if (this.formRef.current) { this.formRef.current.resetFields(); } @@ -449,18 +446,18 @@ class AdvancedConfigurationForm extends React.PureComponent { private renderUzeZipChunks(): JSX.Element { return ( - - - - - Use zip/video chunks - - - - + + + + + Use zip/video chunks + + + + ); } @@ -517,7 +514,6 @@ class AdvancedConfigurationForm extends React.PureComponent { switchDescription='Use project source storage' storageDescription='Specify source storage for import resources like annotation, backups' useProjectStorage={useProjectSourceStorage} - onChangeStorage={(value) => console.log(value)} onChangeUseProjectStorage={onChangeUseProjectSourceStorage} /> ); @@ -535,7 +531,6 @@ class AdvancedConfigurationForm extends React.PureComponent { switchDescription='Use project target storage' storageDescription='Specify target storage for export resources like annotation, backups ' useProjectStorage={useProjectTargetStorage} - onChangeStorage={(value) => console.log(value)} onChangeUseProjectStorage={onChangeUseProjectTargetStorage} /> ); diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index a36a22a8653..b47464c57c2 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -59,11 +60,11 @@ const defaultState = { sortingMethod: SortingMethod.LEXICOGRAPHICAL, sourceStorage: { location: StorageLocation.LOCAL, - cloudStorageId: null, + cloud_storage_id: null, }, targetStorage: { location: StorageLocation.LOCAL, - cloudStorageId: null, + cloud_storage_id: null, }, useProjectSourceStorage: true, useProjectTargetStorage: true, @@ -153,7 +154,6 @@ class CreateTaskContent extends React.PureComponent { - // todo fixme this.setState({ advanced: { ...values }, }); @@ -174,7 +174,6 @@ class CreateTaskContent extends React.PureComponent { - this.setState((state) => ({ advanced: { ...state.advanced, @@ -184,7 +183,6 @@ class CreateTaskContent extends React.PureComponent { - this.setState((state) => ({ advanced: { ...state.advanced, diff --git a/cvat-ui/src/components/cvat-app.tsx b/cvat-ui/src/components/cvat-app.tsx index 4bada4ef598..a572310c391 100644 --- a/cvat-ui/src/components/cvat-app.tsx +++ b/cvat-ui/src/components/cvat-app.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index 2527f723776..b3d2e85218a 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -9,15 +9,12 @@ import Notification from 'antd/lib/notification'; import { useSelector, useDispatch } from 'react-redux'; import { DownloadOutlined, LoadingOutlined } from '@ant-design/icons'; import Text from 'antd/lib/typography/Text'; -import Select from 'antd/lib/select'; import Input from 'antd/lib/input'; -import Form, { FormInstance } from 'antd/lib/form'; +import Form from 'antd/lib/form'; -import { CombinedState, StorageLocation, Storage } from 'reducers/interfaces'; +import { CombinedState, Storage } from 'reducers/interfaces'; import { exportActions, exportBackupAsync } from 'actions/export-actions'; import getCore from 'cvat-core-wrapper'; -import Switch from 'antd/lib/switch'; -import { Space } from 'antd'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -34,24 +31,18 @@ const initialValues: FormValues = { targetStorage: { location: undefined, cloud_storage_id: undefined, - //cloudStorageId: undefined, }, useProjectTargetStorage: true, } function ExportBackupModal(): JSX.Element | null { const dispatch = useDispatch(); - + const [form] = Form.useForm(); const [instanceType, setInstanceType] = useState(''); - const [activity, setActivity] = useState(false); - const [form] = Form.useForm(); - const [useDefaultStorage, setUseDefaultStorage] = useState(true); const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); - // const [storage, setStorage] = useState(null); - const [helpMessage, setHelpMessage] = useState(''); const resource = useSelector((state: CombinedState) => state.export.resource); const instance = useSelector((state: CombinedState) => state.export.instance); @@ -127,12 +118,6 @@ function ExportBackupModal(): JSX.Element | null { [instance, instanceType, useDefaultStorage], ); - // const onChangeStorage = (value: Storage): void => { - // setStorage({ - // ...value, - // } as Storage) - // } - if (resource !== 'backup') return null; return ( @@ -149,14 +134,9 @@ function ExportBackupModal(): JSX.Element | null { name={`Export ${instanceType}`} form={form} layout='vertical' - // labelCol={{ span: 8 }} - // wrapperCol={{ span: 16 }} initialValues={initialValues} onFinish={handleExport} > - {/* wrapperCol={{ offset: 8, span: 16 }} */} - {/*valuePropName='checked'*/} - Custom name} name='customName'> setUseDefaultStorage(value)} - onChangeStorage={(value: Storage) => console.log(value)} /> diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index acc2d053c6f..41b1b3b3b1c 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -10,17 +11,13 @@ import { useSelector, useDispatch } from 'react-redux'; import { DownloadOutlined, LoadingOutlined } from '@ant-design/icons'; import Text from 'antd/lib/typography/Text'; import Select from 'antd/lib/select'; -import Checkbox from 'antd/lib/checkbox'; import Input from 'antd/lib/input'; -import Form, { FormInstance } from 'antd/lib/form'; - -import { CombinedState, StorageLocation, Storage } from 'reducers/interfaces'; +import Form from 'antd/lib/form'; +import { CombinedState, Storage, StorageLocation } from 'reducers/interfaces'; import { exportActions, exportDatasetAsync } from 'actions/export-actions'; import getCore from 'cvat-core-wrapper'; import Switch from 'antd/lib/switch'; import { Space } from 'antd'; - -// import StorageForm from 'components/storage/storage-form'; import TargetStorageField from 'components/storage/target-storage-field'; const core = getCore(); @@ -38,7 +35,7 @@ const initialValues: FormValues = { saveImages: false, customName: undefined, targetStorage: { - location: undefined, + location: StorageLocation.LOCAL, cloud_storage_id: undefined, }, useProjectTargetStorage: true, @@ -69,7 +66,6 @@ function ExportDatasetModal(): JSX.Element | null { setActivities(projectExportActivities[instance.id]?.dataset || []); // TODO need refactoring } else if (instance instanceof core.classes.Task) { - //const taskID = instance instanceof core.classes.Task ? instance.id : instance.taskId; const taskID = instance.id; setInstanceType(`task #${taskID}`); setActivities(taskExportActivities[taskID]?.dataset || []); @@ -145,7 +141,6 @@ function ExportDatasetModal(): JSX.Element | null { closeModal(); Notification.info({ message: 'Dataset export started', - // TODO is it neede to correct description message description: `Dataset export was started for ${instanceType}. ` + 'Download will start automatically as soon as the dataset is ready.', @@ -178,8 +173,6 @@ function ExportDatasetModal(): JSX.Element | null { name='Export dataset' form={form} layout='vertical' - // labelCol={{ span: 8 }} - // wrapperCol={{ span: 16 }} initialValues={initialValues} onFinish={handleExport} > @@ -212,10 +205,6 @@ function ExportDatasetModal(): JSX.Element | null { )} - {/* wrapperCol={{ offset: 8, span: 16 }} */} - {/*valuePropName='checked'*/} - - diff --git a/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx b/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx index 739ec632541..088a2286e5f 100644 --- a/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx +++ b/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -50,53 +51,7 @@ export default function CloudStorageTab(props: Props): JSX.Element { cloudStorage={cloudStorage} setSearchPhrase={setSearchPhrase} onSelectCloudStorage={onSelectCloudStorage} - // cloudStoragesList={list} - // setCloudStoragesList={setList} /> - {/* - { - setSearchPhrase(phrase); - }} - options={list.map((_cloudStorage) => ({ - value: _cloudStorage.id.toString(), - label: ( - - {_cloudStorage.providerType === ProviderType.AWS_S3_BUCKET && } - {_cloudStorage.providerType === ProviderType.AZURE_CONTAINER && } - { - _cloudStorage.providerType === ProviderType.GOOGLE_CLOUD_STORAGE && - - } - {_cloudStorage.displayName} - - ), - }))} - onSelect={(value: string) => { - const selectedCloudStorage = - list.filter((_cloudStorage: CloudStorage) => _cloudStorage.id === +value)[0] || null; - // eslint-disable-next-line prefer-destructuring - selectedCloudStorage.manifestPath = selectedCloudStorage.manifests[0]; - onSelectCloudStorage(selectedCloudStorage); - setSearchPhrase(selectedCloudStorage?.displayName || ''); - }} - allowClear - > - - - */} - {cloudStorage ? ( (null); - const [uploadParams, setUploadParams] = useState(null); + const [uploadParams, setUploadParams] = useState({ + useDefaultSettings: true, + } as UploadParams); + + useEffect(() => { + setUploadParams({ + ...uploadParams, + resource, + sourceStorage: { + location: defaultStorageLocation, + cloudStorageId: defaultStorageCloudId, + } as Storage, + } as UploadParams) + }, [resource, defaultStorageLocation, defaultStorageCloudId]); + + useEffect(() => { + if (importing) { + setUploadParams({ + useDefaultSettings: true, + } as UploadParams); + } + }, [importing]) useEffect(() => { if (instance && modalVisible) { // && resource === 'dataset' @@ -147,10 +168,14 @@ function ImportDatasetModal(): JSX.Element | null { } else if (isDataset() && !['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { message.error('Only ZIP archive is supported for import a dataset'); } else if (isAnnotation() && - !selectedLoader.format.toLowerCase().split(', ').includes(_file.name.split('.')[1])) { + !selectedLoader.format.toLowerCase().split(', ').includes(_file.name.split('.')[_file.name.split('.').length - 1])) { message.error(`For ${selectedLoader.name} format only files with ${selectedLoader.format.toLowerCase()} extension can be used`); } else { setFile(_file); + setUploadParams({ + ...uploadParams, + file: _file, + } as UploadParams); } return false; }} @@ -172,9 +197,9 @@ function ImportDatasetModal(): JSX.Element | null { return Promise.reject(); } if (value) { - const extension = value.toLowerCase().split('.')[1]; + const extension = value.toLowerCase().split('.')[value.split('.').length - 1]; if (isAnnotation()) { - const allowedExtensions = selectedLoader.format.toLowerCase().split(', ') + const allowedExtensions = selectedLoader.format.toLowerCase().split(', '); if (!allowedExtensions.includes(extension)) { return Promise.reject(new Error(`For ${selectedLoader.name} format only files with ${selectedLoader.format.toLowerCase()} extension can be used`)); } @@ -201,6 +226,14 @@ function ImportDatasetModal(): JSX.Element | null { ) => { + if (e.target.value) { + setUploadParams({ + ...uploadParams, + fileName: e.target.value, + } as UploadParams) + }} + } /> ); @@ -213,20 +246,20 @@ function ImportDatasetModal(): JSX.Element | null { dispatch(importActions.closeImportModal(instance)); }, [form, instance]); - const onUpload = useCallback(() => { + const onUpload = () => { if (uploadParams && uploadParams.resource) { dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, uploadParams.useDefaultSettings, uploadParams.sourceStorage, uploadParams.file, uploadParams.fileName)); - const resource = uploadParams.resource.charAt(0).toUpperCase() + uploadParams.resource.slice(1); + const _resource = uploadParams.resource.charAt(0).toUpperCase() + uploadParams.resource.slice(1); Notification.info({ - message: `${resource} import started`, - description: `${resource} import was started for ${instanceType}. `, + message: `${_resource} import started`, + description: `${_resource} import was started for ${instanceType}. `, className: `cvat-notification-notice-import-${uploadParams.resource}-start`, }); } - }, [uploadParams]); + }; const confirmUpload = () => { confirm({ @@ -252,20 +285,6 @@ function ImportDatasetModal(): JSX.Element | null { }); return; } - const fileName = values.fileName || null; - const sourceStorage = { - location: (values.sourceStorage.location) ? values.sourceStorage.location : defaultStorageLocation, - cloudStorageId: (values.sourceStorage.location) ? values.sourceStorage.cloudStorageId : defaultStorageCloudId, - } as Storage; - - setUploadParams({ - resource, - selectedFormat: values.selectedFormat || null, - useDefaultSettings, - sourceStorage, - file: file || null, - fileName: fileName || null - }); if (isAnnotation()) { confirmUpload(); @@ -274,7 +293,7 @@ function ImportDatasetModal(): JSX.Element | null { } closeModal(); }, - [instance?.id, file, useDefaultSettings, resource, defaultStorageLocation], + [instance?.id, uploadParams], ); return ( @@ -323,6 +342,10 @@ function ImportDatasetModal(): JSX.Element | null { (importer: any): boolean => importer.name === _format ); setSelectedLoader(_loader); + setUploadParams({ + ...uploadParams, + selectedFormat: _format + } as UploadParams); }} > {importers @@ -361,6 +384,10 @@ function ImportDatasetModal(): JSX.Element | null { { setUseDefaultSettings(value); + setUploadParams({ + ...uploadParams, + useDefaultSettings: value, + } as UploadParams) }} /> @@ -377,7 +404,17 @@ function ImportDatasetModal(): JSX.Element | null { {!useDefaultSettings && setSelectedSourceStorage(value)} + onChangeStorage={(value: Storage) => { + setSelectedSourceStorage(value); + setUploadParams({ + ...uploadParams, + sourceStorage: { + location: (value.location) ? value.location : defaultStorageLocation, + cloudStorageId: (value.location) ? value.cloudStorageId : defaultStorageCloudId, + } as Storage, + } as UploadParams); + console.log('after update storage: ', uploadParams); + }} />} {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.LOCAL && uploadLocalFile()} diff --git a/cvat-ui/src/components/storage/source-storage-field.tsx b/cvat-ui/src/components/storage/source-storage-field.tsx index d58bf278e5c..fdc442803ff 100644 --- a/cvat-ui/src/components/storage/source-storage-field.tsx +++ b/cvat-ui/src/components/storage/source-storage-field.tsx @@ -14,7 +14,7 @@ export interface Props { switchHelpMessage?: string; storageDescription?: string; useProjectStorage?: boolean | null; - onChangeStorage: (values: Storage) => void; + onChangeStorage?: (values: Storage) => void; onChangeUseProjectStorage?: (value: boolean) => void; } diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index 6e99b56c4fd..526658aad6a 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -4,24 +4,18 @@ import './styles.scss'; import React, { useEffect, useState } from 'react'; -import { QuestionCircleFilled } from '@ant-design/icons'; import Select from 'antd/lib/select'; import Form from 'antd/lib/form'; - import { CloudStorage } from 'reducers/interfaces'; -import CVATTooltip from 'components/common/cvat-tooltip'; import { StorageLocation } from 'reducers/interfaces'; import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; -import Space from 'antd/lib/space'; import { Storage } from 'reducers/interfaces'; const { Option } = Select; export interface Props { - //locationLabel: string; locationName: string[]; - //locationDescription: string; selectCloudStorageName: string[]; onChangeStorage?: (value: Storage) => void; } diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index 4264f5358ed..5db052792c0 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -3,14 +3,14 @@ // SPDX-License-Identifier: MIT import './styles.scss'; -import React, { RefObject, useState } from 'react'; -import Form, { FormInstance } from 'antd/lib/form'; +import React from 'react'; +import Form from 'antd/lib/form'; import Text from 'antd/lib/typography/Text'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; import StorageField from './storage-field'; -import { Storage, StorageLocation } from 'reducers/interfaces'; +import { Storage } from 'reducers/interfaces'; import Tooltip from 'antd/lib/tooltip'; import { QuestionCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; @@ -24,7 +24,7 @@ export interface Props { switchHelpMessage?: string; storageDescription?: string; useProjectStorage?: boolean | null; - onChangeStorage: (values: Storage) => void; + onChangeStorage?: (values: Storage) => void; onChangeUseProjectStorage?: (value: boolean) => void; } diff --git a/cvat-ui/src/components/storage/target-storage-field.tsx b/cvat-ui/src/components/storage/target-storage-field.tsx index a1a2e59aadf..365780163a3 100644 --- a/cvat-ui/src/components/storage/target-storage-field.tsx +++ b/cvat-ui/src/components/storage/target-storage-field.tsx @@ -14,7 +14,7 @@ export interface Props { switchHelpMessage?: string; storageDescription?: string; useProjectStorage?: boolean | null; - onChangeStorage: (values: Storage) => void; + onChangeStorage?: (values: Storage) => void; onChangeUseProjectStorage?: (value: boolean) => void; } diff --git a/cvat-ui/src/reducers/import-backup-reducer.ts b/cvat-ui/src/reducers/import-backup-reducer.ts index 40ce318e3c4..ba3fc46362a 100644 --- a/cvat-ui/src/reducers/import-backup-reducer.ts +++ b/cvat-ui/src/reducers/import-backup-reducer.ts @@ -1,4 +1,4 @@ -// Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -31,14 +31,6 @@ export default (state: ImportBackupState = defaultState, action: ImportBackupAct modalVisible: false, }; } - // case ImportBackupActionTypes.IMPORT_UPDATE_STATUS: { - // const { progress, status } = action.payload; - // return { - // ...state, - // progress, - // status, - // }; - // } case ImportBackupActionTypes.IMPORT_BACKUP: { const { instanceType } = state; const field = (instanceType === 'project') ? 'isProjectImported' : 'isTaskImported'; diff --git a/cvat-ui/src/reducers/import-reducer.ts b/cvat-ui/src/reducers/import-reducer.ts index 322b454d3a5..029a90b44ba 100644 --- a/cvat-ui/src/reducers/import-reducer.ts +++ b/cvat-ui/src/reducers/import-reducer.ts @@ -119,7 +119,7 @@ export default (state: ImportDatasetState = defaultState, action: ImportActions) //importingId: id, }; } - case ImportActionTypes.IMPORT_UPDATE_STATUS: { + case ImportActionTypes.IMPORT_DATASET_UPDATE_STATUS: { const { progress, status, instance } = action.payload; const activitiesField = defineActititiesField(instance); From e8388d6d193ffd3564e3ed0b9b4f432305bd8d05 Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 9 Aug 2022 16:50:29 +0200 Subject: [PATCH 05/60] Update remaining licence headers && small changes --- cvat-core/src/server-proxy.ts | 6 +-- cvat-core/src/session.ts | 2 +- .../advanced-configuration-form.tsx | 24 ++++----- .../export-dataset/export-dataset-modal.tsx | 2 +- .../components/file-manager/file-manager.tsx | 1 - .../import-dataset/import-dataset-modal.tsx | 49 +++++++------------ .../import-dataset-status-modal.tsx | 20 ++++---- cvat-ui/src/components/jobs-page/job-card.tsx | 4 +- .../components/project-page/project-page.tsx | 3 +- .../components/projects-page/actions-menu.tsx | 1 + .../projects-page/projects-page.tsx | 4 +- .../src/components/projects-page/top-bar.tsx | 17 +------ .../select-cloud-storage.tsx | 9 +--- .../storage/source-storage-field.tsx | 3 +- .../src/components/storage/storage-field.tsx | 7 +-- .../storage/storage-with-switch-field.tsx | 5 +- cvat-ui/src/components/storage/styles.scss | 2 +- .../storage/target-storage-field.tsx | 2 +- .../src/components/tasks-page/tasks-page.tsx | 3 +- cvat-ui/src/components/tasks-page/top-bar.tsx | 20 +------- .../containers/actions-menu/actions-menu.tsx | 24 ++------- .../top-bar/annotation-menu.tsx | 28 +---------- .../src/containers/tasks-page/tasks-page.tsx | 1 + cvat-ui/src/reducers/annotation-reducer.ts | 10 +--- cvat-ui/src/reducers/export-reducer.ts | 2 +- cvat-ui/src/reducers/import-backup-reducer.ts | 5 -- cvat-ui/src/reducers/import-reducer.ts | 36 ++------------ cvat-ui/src/reducers/interfaces.ts | 21 +------- cvat-ui/src/reducers/notifications-reducer.ts | 1 + cvat-ui/src/reducers/projects-reducer.ts | 1 + cvat-ui/src/reducers/root-reducer.ts | 1 + cvat-ui/src/reducers/tasks-reducer.ts | 1 + cvat/apps/engine/backup.py | 1 + 33 files changed, 76 insertions(+), 240 deletions(-) diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index c92be4c45ba..d62f2c00ee0 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -597,9 +597,9 @@ return async function (id, format, name, saveImages, targetStorage = null) { const { backendAPI } = config; const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; - let params: any = { + const params: any = { ...enableOrganization(), - ...configureStorage(!!targetStorage?.location, targetStorage), + ...configureStorage(!targetStorage?.location, targetStorage), format, }; @@ -641,7 +641,7 @@ async function importDataset(id, format, useDefaultLocation, sourceStorage, file, fileName, onUpdate) { const { backendAPI, origin } = config; - let params: any = { + const params: any = { ...enableOrganization(), ...configureStorage(useDefaultLocation, sourceStorage), format, diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 04fe12c0875..5fc2cb3a464 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -1759,7 +1759,7 @@ /** * Source storage for import resources. * @name sourceStorage - * @type {module:API.cvat.classes.Storage} + * @type {module:API.cvat.classes.Storage} * @memberof module:API.cvat.classes.Task * @instance * @throws {module:API.cvat.exceptions.ArgumentError} diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 9b311bdd508..e27a7efa9de 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -446,18 +446,18 @@ class AdvancedConfigurationForm extends React.PureComponent { private renderUzeZipChunks(): JSX.Element { return ( - - - - - Use zip/video chunks - - - - + + + + + Use zip/video chunks + + + + ); } diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 41b1b3b3b1c..5a85e5612ee 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -207,7 +207,7 @@ function ExportDatasetModal(): JSX.Element | null {
- + Save images diff --git a/cvat-ui/src/components/file-manager/file-manager.tsx b/cvat-ui/src/components/file-manager/file-manager.tsx index 59a28b71f5b..fb8f40f24ea 100644 --- a/cvat-ui/src/components/file-manager/file-manager.tsx +++ b/cvat-ui/src/components/file-manager/file-manager.tsx @@ -270,7 +270,6 @@ export class FileManager extends React.PureComponent { onSelectCloudStorage={(_cloudStorage: CloudStorage | null) => { this.setState({ cloudStorage: _cloudStorage }); }} - // TODO: move this logic into select cloud storage component searchPhrase={potentialCloudStorage} setSearchPhrase={(_potentialCloudStorage: string) => { this.setState({ potentialCloudStorage: _potentialCloudStorage }); diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 5ae80bb6f6e..8151a5804d5 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -13,22 +13,16 @@ import Select from 'antd/lib/select'; import Notification from 'antd/lib/notification'; import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; - import { StorageLocation } from 'reducers/interfaces'; - import { UploadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleOutlined, } from '@ant-design/icons'; - import CVATTooltip from 'components/common/cvat-tooltip'; import { CombinedState } from 'reducers/interfaces'; import { importActions, importDatasetAsync } from 'actions/import-actions'; - import ImportDatasetStatusModal from './import-dataset-status-modal'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; -import Tooltip from 'antd/lib/tooltip'; - import getCore from 'cvat-core-wrapper'; import StorageField from 'components/storage/storage-field'; import { Storage } from 'reducers/interfaces'; @@ -66,20 +60,26 @@ interface UploadParams { function ImportDatasetModal(): JSX.Element | null { const [form] = Form.useForm(); + const dispatch = useDispatch(); const [instanceType, setInstanceType] = useState(''); const [file, setFile] = useState(null); + const [selectedLoader, setSelectedLoader] = useState(null); + const [useDefaultSettings, setUseDefaultSettings] = useState(true); + const [defaultStorageLocation, setDefaultStorageLocation] = useState(''); + const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); + const [helpMessage, setHelpMessage] = useState(''); + const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); + const [uploadParams, setUploadParams] = useState({ + useDefaultSettings: true, + } as UploadParams); const importers = useSelector((state: CombinedState) => state.formats.annotationFormats.loaders); - const dispatch = useDispatch(); - const resource = useSelector((state: CombinedState) => state.import.resource); const instance = useSelector((state: CombinedState) => state.import.instance); const projectsImportState = useSelector((state: CombinedState) => state.import.projects); const tasksImportState = useSelector((state: CombinedState) => state.import.tasks); const jobsImportState = useSelector((state: CombinedState) => state.import.jobs); - const importing = useSelector((state: CombinedState) => state.import.importing); - - const [selectedLoader, setSelectedLoader] = useState(null); + const modalVisible = useSelector((state: CombinedState) => state.import.modalVisible); const isDataset = useCallback((): boolean => { return resource === 'dataset'; @@ -89,18 +89,6 @@ function ImportDatasetModal(): JSX.Element | null { return resource === 'annotation'; }, [resource]); - const modalVisible = useSelector((state: CombinedState) => state.import.modalVisible); - - const [useDefaultSettings, setUseDefaultSettings] = useState(true); - const [defaultStorageLocation, setDefaultStorageLocation] = useState(''); - const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); - const [helpMessage, setHelpMessage] = useState(''); - const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); - - const [uploadParams, setUploadParams] = useState({ - useDefaultSettings: true, - } as UploadParams); - useEffect(() => { setUploadParams({ ...uploadParams, @@ -121,7 +109,7 @@ function ImportDatasetModal(): JSX.Element | null { }, [importing]) useEffect(() => { - if (instance && modalVisible) { // && resource === 'dataset' + if (instance && modalVisible) { if (instance instanceof core.classes.Project || instance instanceof core.classes.Task) { setDefaultStorageLocation((instance.sourceStorage) ? instance.sourceStorage.location : null); @@ -281,7 +269,7 @@ function ImportDatasetModal(): JSX.Element | null { (values: FormValues): void => { if (file === null && !values.fileName) { Notification.error({ - message: 'No dataset file specified', + message: `No ${uploadParams.resource} file specified`, }); return; } @@ -392,14 +380,12 @@ function ImportDatasetModal(): JSX.Element | null { /> Use default settings - + - + - {useDefaultSettings && defaultStorageLocation === StorageLocation.LOCAL && uploadLocalFile()} + {useDefaultSettings && (defaultStorageLocation === StorageLocation.LOCAL || defaultStorageLocation === null) && uploadLocalFile()} {useDefaultSettings && defaultStorageLocation === StorageLocation.CLOUD_STORAGE && renderCustomName()} {!useDefaultSettings && } {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.LOCAL && uploadLocalFile()} - {isDataset() && } + ); } diff --git a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx index 44d1a99db54..a3f93d0df1b 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -14,23 +15,20 @@ import { CombinedState } from 'reducers/interfaces'; const core = getCore(); -function ImportDatasetStatusModal(): JSX.Element { +function ImportDatasetStatusModal(): JSX.Element | null { const importing = useSelector((state: CombinedState) => state.import.importing); - const instance = useSelector((state: CombinedState) => state.import.instance); - const progress = useSelector((state: CombinedState) => { - if (instance instanceof core.classes.Project) { - return state.import.projects?.progress; - } - }); + const importingId = useSelector((state: CombinedState) => state.import.projects?.importingId); + const progress = useSelector((state: CombinedState) => state.import.projects?.progress); const status = useSelector((state: CombinedState) => { - if (instance instanceof core.classes.Project) { - return state.import.projects?.status; - } + return state.import.projects?.status; }); + if (!importingId) { + return null; + } return ( - {/* */} ); } diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 1157954d713..2e38ae7a32d 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/components/projects-page/projects-page.tsx b/cvat-ui/src/components/projects-page/projects-page.tsx index e14c80e0178..cf7d6a8c7c4 100644 --- a/cvat-ui/src/components/projects-page/projects-page.tsx +++ b/cvat-ui/src/components/projects-page/projects-page.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -82,8 +83,6 @@ export default function ProjectsPageComponent(): JSX.Element { ); }} query={updatedQuery} - // TODO - // onImportProject={(file: File) => dispatch(restoreProjectAsync(file))} importing={importing} /> { fetching ? ( @@ -92,7 +91,6 @@ export default function ProjectsPageComponent(): JSX.Element { ) : content } - {/* */} ); } diff --git a/cvat-ui/src/components/projects-page/top-bar.tsx b/cvat-ui/src/components/projects-page/top-bar.tsx index 8f8467e3136..c3e00a49d40 100644 --- a/cvat-ui/src/components/projects-page/top-bar.tsx +++ b/cvat-ui/src/components/projects-page/top-bar.tsx @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -9,8 +10,6 @@ import Button from 'antd/lib/button'; import Dropdown from 'antd/lib/dropdown'; import Input from 'antd/lib/input'; import { PlusOutlined, UploadOutlined, LoadingOutlined } from '@ant-design/icons'; -import Upload from 'antd/lib/upload'; - import { usePrevious } from 'utils/hooks'; import { ProjectsQuery } from 'reducers/interfaces'; import { SortingComponent, ResourceFilterHOC, defaultVisibility } from 'components/resource-sorting-filtering'; @@ -27,7 +26,6 @@ const FilteringComponent = ResourceFilterHOC( ); interface Props { - // onImportProject(file: File): void; onApplyFilter(filter: string | null): void; onApplySorting(sorting: string | null): void; onApplySearch(search: string | null): void; @@ -38,7 +36,7 @@ interface Props { function TopBarComponent(props: Props): JSX.Element { const dispatch = useDispatch(); const { - importing, query, onApplyFilter, onApplySorting, onApplySearch,// onImportProject, + importing, query, onApplyFilter, onApplySorting, onApplySearch, } = props; const [visibility, setVisibility] = useState(defaultVisibility); const prevImporting = usePrevious(importing); @@ -105,16 +103,6 @@ function TopBarComponent(props: Props): JSX.Element { > Create a new project - {/* { - onImportProject(file); - return false; - }} - className='cvat-import-project' - > */} - {/* */} )} > diff --git a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx index 909f984a434..b49fe1f4232 100644 --- a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx +++ b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx @@ -2,30 +2,23 @@ // // SPDX-License-Identifier: MIT -// import './styles.scss'; import React, { useEffect, useState } from 'react'; import Form from 'antd/lib/form'; import notification from 'antd/lib/notification'; import AutoComplete from 'antd/lib/auto-complete'; import Input from 'antd/lib/input'; import { debounce } from 'lodash'; - -import Select from 'antd/lib/select'; -import getCore from 'cvat-core-wrapper'; import { CloudStorage } from 'reducers/interfaces'; import { AzureProvider, GoogleCloudProvider, S3Provider } from 'icons'; import { ProviderType } from 'utils/enums'; - - +import getCore from 'cvat-core-wrapper'; export interface Props { searchPhrase: string; cloudStorage: CloudStorage | null; name?: string[]; setSearchPhrase: (searchPhrase: string) => void; onSelectCloudStorage: (cloudStorageId: number | null) => void; - } -const { Option } = Select; async function searchCloudStorages(filter: Record): Promise { try { diff --git a/cvat-ui/src/components/storage/source-storage-field.tsx b/cvat-ui/src/components/storage/source-storage-field.tsx index fdc442803ff..96f843f9a12 100644 --- a/cvat-ui/src/components/storage/source-storage-field.tsx +++ b/cvat-ui/src/components/storage/source-storage-field.tsx @@ -1,11 +1,10 @@ -// (C) 2022 CVAT.ai Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT import './styles.scss'; import React from 'react'; import { Storage } from 'reducers/interfaces'; - import StorageWithSwitchField from './storage-with-switch-field'; export interface Props { diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index 526658aad6a..b051f451181 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -1,4 +1,4 @@ -// (C) 2022 CVAT.ai Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -9,7 +9,6 @@ import Form from 'antd/lib/form'; import { CloudStorage } from 'reducers/interfaces'; import { StorageLocation } from 'reducers/interfaces'; import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; - import { Storage } from 'reducers/interfaces'; const { Option } = Select; @@ -61,9 +60,7 @@ export default function StorageField(props: Props): JSX.Element { return ( <> - + { const [_loader] = importers.filter( (importer: any): boolean => importer.name === _format diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index c2cb6057e4b..97b374ea1ab 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -433,20 +433,29 @@ export default function (state = defaultState, action: AnyAction): Notifications } case ImportActionTypes.IMPORT_DATASET_SUCCESS: { const { instance, resource } = action.payload; + const message = resource === 'annotation' ? + 'Annotations have been loaded to the ' + + `task ${instance.taskId || instance.id}` : + 'Dataset has been imported to the ' + + `project ${instance.id}`; return { ...state, messages: { ...state.messages, importing: { ...state.messages.importing, - [resource]: - `The ${resource} for resource ${instance.id} has been uploaded`, + [resource]: message, }, }, }; } case ImportActionTypes.IMPORT_DATASET_FAILED: { - const instanceID = action.payload.instanceId; + const { instance, resource } = action.payload; + const message = resource === 'annotation' ? 'Could not upload annotation for the ' + + `` : + 'Could not import dataset to the ' + + `` + + `project ${instance.id}` return { ...state, errors: { @@ -454,11 +463,10 @@ export default function (state = defaultState, action: AnyAction): Notifications importing: { ...state.errors.importing, dataset: { - message: - 'Could not import dataset to the ' + - `` + - `project ${instanceID}`, + message: message, reason: action.payload.error.toString(), + className: 'cvat-notification-notice-' + + `${resource === 'annotation' ? "load-annotation" : "import-dataset"}-failed` }, }, }, @@ -511,40 +519,6 @@ export default function (state = defaultState, action: AnyAction): Notifications }, }; } - case TasksActionTypes.LOAD_ANNOTATIONS_FAILED: { - const taskID = action.payload.task.id; - return { - ...state, - errors: { - ...state.errors, - tasks: { - ...state.errors.tasks, - loading: { - message: - 'Could not upload annotation for the ' + - `task ${taskID}`, - reason: action.payload.error.toString(), - className: 'cvat-notification-notice-load-annotation-failed', - }, - }, - }, - }; - } - case TasksActionTypes.LOAD_ANNOTATIONS_SUCCESS: { - const taskID = action.payload.task.id; - return { - ...state, - messages: { - ...state.messages, - tasks: { - ...state.messages.tasks, - loadingDone: - 'Annotations have been loaded to the ' + - `task ${taskID}`, - }, - }, - }; - } case TasksActionTypes.UPDATE_TASK_FAILED: { const taskID = action.payload.task.id; return { diff --git a/tests/cypress/integration/actions_projects_models/case_103_project_export.js b/tests/cypress/integration/actions_projects_models/case_103_project_export.js index c0966b3907e..d29c55523bc 100644 --- a/tests/cypress/integration/actions_projects_models/case_103_project_export.js +++ b/tests/cypress/integration/actions_projects_models/case_103_project_export.js @@ -98,8 +98,7 @@ context('Export project dataset.', { browser: '!firefox' }, () => { datasetArchiveName = file; cy.verifyDownload(datasetArchiveName); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); }); it('Export project dataset. Dataset.', () => { @@ -145,8 +144,7 @@ context('Export project dataset.', { browser: '!firefox' }, () => { archive: datasetArchiveName, }; cy.importProject(importDataset); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); cy.openProject(projectName); cy.get('.cvat-tasks-list-item').should('have.length', 1); }); @@ -176,8 +174,7 @@ context('Export project dataset.', { browser: '!firefox' }, () => { archive: datasetArchiveName, }; cy.importProject(importDataset); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); cy.openProject(projectName); cy.get('.cvat-tasks-list-item').should('have.length', 1); cy.get('.cvat-constructor-viewer-item') diff --git a/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js b/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js index 77a08b5c48f..1d41f6b3a66 100644 --- a/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js +++ b/tests/cypress/integration/actions_projects_models/case_104_project_export_3d.js @@ -76,8 +76,7 @@ context('Export project dataset with 3D task.', { browser: '!firefox' }, () => { datasetArchiveName = file; cy.verifyDownload(datasetArchiveName); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); }); it('Export project with 3D task. Annotation. Rename a archive.', () => { @@ -108,8 +107,7 @@ context('Export project dataset with 3D task.', { browser: '!firefox' }, () => { archive: datasetArchiveName, }; cy.importProject(importDataset); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); cy.openProject(projectName); cy.get('.cvat-tasks-list-item').should('have.length', 1); }); diff --git a/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js b/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js index 9ad32230c15..9229fc7f30a 100644 --- a/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js +++ b/tests/cypress/integration/actions_projects_models/case_114_backup_restore_project.js @@ -92,8 +92,7 @@ context('Backup, restore a project.', { browser: '!firefox' }, () => { projectBackupArchiveFullName = file; cy.verifyDownload(projectBackupArchiveFullName); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); }); it('Remove and restore the project from backup.', () => { @@ -158,8 +157,7 @@ context('Backup, restore a project with a 3D task.', { browser: '!firefox' }, () projectBackupArchiveFullName = file; cy.verifyDownload(projectBackupArchiveFullName); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); }); it('Remove and restore the project from backup.', () => { diff --git a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js index d895dd4ff3b..ea2f7174fe6 100644 --- a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js +++ b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js @@ -43,18 +43,13 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { .parents('.cvat-tasks-list-item') .find('.cvat-menu-icon') .trigger('mouseover'); - cy.contains('Upload annotations').trigger('mouseover'); - cy.contains('.cvat-menu-load-submenu-item', exportFormat.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click(); - }); - // when a user clicks, menu is closing and it triggers rerender - // we use mouseout here to emulate user behaviour - cy.get('.cvat-actions-menu').trigger('mouseout').should('be.hidden'); - cy.contains('.cvat-menu-load-submenu-item', exportFormat.split(' ')[0]).within(() => { - cy.get('input[type=file]').attachFile(annotationArchiveNameCustomeName); - }); + cy.contains('Upload annotations').click(); + cy.get('.cvat-modal-import-dataset').find('.cvat-modal-import-select').click(); + cy.contains('.cvat-modal-import-dataset-option-item', exportFormat.split(' ')[0]).click(); + cy.get('.cvat-modal-import-select').should('contain.text', exportFormat.split(' ')[0]); + cy.get('input[type="file"]').attachFile(annotationArchiveNameCustomeName, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${annotationArchiveNameCustomeName}"]`).should('be.visible'); + cy.contains('button', 'OK').click(); } function confirmUpdate(modalWindowClassName) { @@ -84,6 +79,7 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { annotationArchiveNameCustomeName = file; cy.verifyDownload(annotationArchiveNameCustomeName); }); + cy.verifyNotification(); }); it('Save job. Dump annotation. Remove annotation. Save job.', () => { @@ -97,6 +93,7 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { annotationArchiveName = file; cy.verifyDownload(annotationArchiveName); }); + cy.verifyNotification(); cy.removeAnnotations(); cy.saveJob('PUT'); cy.get('#cvat_canvas_shape_1').should('not.exist'); @@ -105,20 +102,19 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { it('Upload annotation to job.', () => { cy.interactMenu('Upload annotations'); - cy.contains('.cvat-menu-load-submenu-item', exportFormat.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click(); - }); - // when a user clicks, menu is closing and it triggers rerender - // we use mouseout here to emulate user behaviour - cy.get('.cvat-annotation-menu').trigger('mouseout').should('be.hidden'); - cy.contains('.cvat-menu-load-submenu-item', exportFormat.split(' ')[0]).within(() => { - cy.get('input[type=file]').attachFile(annotationArchiveName); - }); + cy.get('.cvat-modal-import-dataset') + cy.get('.cvat-modal-import-select').click(); + cy.contains('.cvat-modal-import-dataset-option-item', exportFormat.split(' ')[0]).click(); + cy.get('.cvat-modal-import-select').should('contain.text', exportFormat.split(' ')[0]); + cy.get('input[type="file"]').attachFile(annotationArchiveName, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${annotationArchiveName}"]`).should('be.visible'); + cy.contains('button', 'OK').click(); confirmUpdate('.cvat-modal-content-load-job-annotation'); cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); + cy.verifyNotification(); cy.get('#cvat_canvas_shape_1').should('exist'); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.removeAnnotations(); @@ -130,8 +126,9 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { cy.goToTaskList(); uploadToTask(taskName); confirmUpdate('.cvat-modal-content-load-task-annotation'); - cy.contains('Annotations have been loaded').should('be.visible'); - cy.get('[data-icon="close"]').click(); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); + cy.verifyNotification(); cy.openTaskJob(taskName, 0, false); cy.get('#cvat_canvas_shape_1').should('exist'); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); @@ -154,6 +151,8 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { cy.createAnnotationTask(taskNameSecond, labelNameSecond, attrName, textDefaultValue, archiveName); uploadToTask(taskNameSecond); confirmUpdate('.cvat-modal-content-load-task-annotation'); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); cy.get('.cvat-notification-notice-load-annotation-failed') .should('exist') .find('[aria-label="close"]') diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js index f04c125b4f2..a37d29f2b86 100644 --- a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js +++ b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js @@ -36,11 +36,30 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox let annotationArchiveName = ''; function confirmUpdate(modalWindowClassName) { - cy.get(modalWindowClassName).within(() => { + cy.get(modalWindowClassName).should('be.visible').within(() => { cy.contains('button', 'Update').click(); }); } + function uploadAnnotation(format, file, confirmModalClassName) { + cy.get('.cvat-modal-import-dataset').should('be.visible'); + cy.get('.cvat-modal-import-select').click(); + cy.get('.ant-select-dropdown') + .not('.ant-select-dropdown-hidden').within(() => { + cy.get('.rc-virtual-list-holder') + .contains('.cvat-modal-import-dataset-option-item', format) + .click(); + }); + cy.get('.cvat-modal-import-select').should('contain.text', format); + cy.get('input[type="file"]').attachFile(file, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${file}"]`).should('be.visible'); + cy.contains('button', 'OK').click(); + confirmUpdate(confirmModalClassName); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); + } + + before(() => { cy.visit('auth/login'); cy.login(); @@ -67,20 +86,19 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox cy.saveJob('PATCH', 200, 'saveJobDump'); cy.intercept('GET', '/api/tasks/**/annotations**').as('dumpAnnotations'); cy.interactMenu('Export task dataset'); - cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click(); + cy.get('.cvat-modal-export-select').click(); cy.get('.ant-select-dropdown') - .not('.ant-select-dropdown-hidden') - .within(() => { - cy.get('.rc-virtual-list-holder') - .contains('.cvat-modal-export-option-item', dumpType) - .scrollIntoView() - .should('be.visible') - .click(); - }); + .not('.ant-select-dropdown-hidden'); + cy.get('.rc-virtual-list-holder') + .contains('.cvat-modal-export-option-item', dumpType) + .click(); cy.get('.cvat-modal-export-select').should('contain.text', dumpType); cy.get('.cvat-modal-export-task').contains('button', 'OK').click(); + cy.get('.cvat-notification-notice-export-task-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-export-task-start'); cy.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202); cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201); + cy.verifyNotification(); cy.removeAnnotations(); cy.saveJob('PUT'); cy.get('#cvat_canvas_shape_1').should('not.exist'); @@ -95,18 +113,15 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox it('Upload annotation with YOLO format to job.', () => { cy.interactMenu('Upload annotations'); - cy.contains('.cvat-menu-load-submenu-item', dumpType.split(' ')[0]) - .scrollIntoView() - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button') - .click() - .get('input[type=file]') - .attachFile(annotationArchiveName); - }); + uploadAnnotation( + dumpType.split(' ')[0], + annotationArchiveName, + '.cvat-modal-content-load-job-annotation' + ); cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); - confirmUpdate('.cvat-modal-content-load-job-annotation'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); + cy.contains('Annotations have been loaded').should('be.visible'); + cy.closeNotification('.ant-notification-notice-info'); cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); cy.get('#cvat_canvas_shape_1').should('exist'); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); diff --git a/tests/cypress/integration/actions_tasks2/case_97_export_import_task.js b/tests/cypress/integration/actions_tasks2/case_97_export_import_task.js index f33db98c27c..45a4be964d0 100644 --- a/tests/cypress/integration/actions_tasks2/case_97_export_import_task.js +++ b/tests/cypress/integration/actions_tasks2/case_97_export_import_task.js @@ -93,8 +93,7 @@ context('Export, import an annotation task.', { browser: '!firefox' }, () => { taskBackupArchiveFullName = file; cy.verifyDownload(taskBackupArchiveFullName); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); cy.deleteTask(taskName); }); diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js index c0371417ac0..e9f24e061b2 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js @@ -21,6 +21,19 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', }); } + function uploadAnnotation(format, file, confirmModalClassName) { + cy.get('.cvat-modal-import-dataset').should('be.visible'); + cy.get('.cvat-modal-import-select').click(); + cy.contains('.cvat-modal-import-dataset-option-item', format).click(); + cy.get('.cvat-modal-import-select').should('contain.text', format); + cy.get('input[type="file"]').attachFile(file, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${file}"]`).should('be.visible'); + cy.contains('button', 'OK').click(); + confirmUpdate(confirmModalClassName); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); + } + before(() => { cy.openTask(taskName); cy.openJob(); @@ -41,6 +54,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', annotationPCArchiveName = file; cy.verifyDownload(annotationPCArchiveName); }); + cy.verifyNotification(); }); it('Export with "Point Cloud" format. Renaming the archive', () => { @@ -55,6 +69,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', annotationPCArchiveCustomeName = file; cy.verifyDownload(annotationPCArchiveCustomeName); }); + cy.verifyNotification(); cy.removeAnnotations(); cy.saveJob('PUT'); cy.get('#cvat-objects-sidebar-state-item-1').should('not.exist'); @@ -62,21 +77,14 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', it('Upload "Point Cloud" format annotation to job.', () => { cy.interactMenu('Upload annotations'); - cy.readFile(`cypress/fixtures/${annotationPCArchiveName}`, 'binary') - .then(Cypress.Blob.binaryStringToBlob) - .then((fileContent) => { - cy.contains('.cvat-menu-load-submenu-item', dumpTypePC.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click().get('input[type=file]').attachFile({ - fileContent, - fileName: annotationPCArchiveName, - }); - }); - }); - confirmUpdate('.cvat-modal-content-load-job-annotation'); + uploadAnnotation( + dumpTypePC.split(' ')[0], + annotationPCArchiveName, + '.cvat-modal-content-load-job-annotation' + ); cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); + cy.verifyNotification(); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.removeAnnotations(); cy.get('button').contains('Save').click().trigger('mouseout'); @@ -89,22 +97,14 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', .parents('.cvat-tasks-list-item') .find('.cvat-menu-icon') .trigger('mouseover'); - cy.contains('Upload annotations').trigger('mouseover'); - cy.readFile(`cypress/fixtures/${annotationPCArchiveCustomeName}`, 'binary') - .then(Cypress.Blob.binaryStringToBlob) - .then((fileContent) => { - cy.contains('.cvat-menu-load-submenu-item', dumpTypePC.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click().get('input[type=file]').attachFile({ - fileName: annotationPCArchiveCustomeName, - fileContent, - }); - }); - }); - confirmUpdate('.cvat-modal-content-load-task-annotation'); + cy.contains('Upload annotations').click(); + uploadAnnotation( + dumpTypePC.split(' ')[0], + annotationPCArchiveName, + '.cvat-modal-content-load-task-annotation' + ); cy.contains('Annotations have been loaded').should('be.visible'); - cy.get('[data-icon="close"]').click(); + cy.closeNotification('.ant-notification-notice-info'); cy.openTaskJob(taskName); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.removeAnnotations(); diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js index ad67811d3de..34c859edc05 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js @@ -21,6 +21,19 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form }); } + function uploadAnnotation(format, file, confirmModalClassName) { + cy.get('.cvat-modal-import-dataset').should('be.visible'); + cy.get('.cvat-modal-import-select').click(); + cy.contains('.cvat-modal-import-dataset-option-item', format).click(); + cy.get('.cvat-modal-import-select').should('contain.text', format); + cy.get('input[type="file"]').attachFile(file, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${file}"]`).should('be.visible'); + cy.contains('button', 'OK').click(); + confirmUpdate(confirmModalClassName); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); + } + before(() => { cy.openTask(taskName); cy.openJob(); @@ -41,6 +54,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form annotationVCArchiveName = file; cy.verifyDownload(annotationVCArchiveName); }); + cy.verifyNotification(); }); it('Export with "Point Cloud" format. Renaming the archive', () => { @@ -55,6 +69,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form annotationVCArchiveNameCustomeName = file; cy.verifyDownload(annotationVCArchiveNameCustomeName); }); + cy.verifyNotification(); cy.removeAnnotations(); cy.saveJob('PUT'); cy.get('#cvat-objects-sidebar-state-item-1').should('not.exist'); @@ -62,21 +77,15 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form it('Upload "Velodyne Points" format annotation to job.', () => { cy.interactMenu('Upload annotations'); - cy.readFile(`cypress/fixtures/${annotationVCArchiveName}`, 'binary') - .then(Cypress.Blob.binaryStringToBlob) - .then((fileContent) => { - cy.contains('.cvat-menu-load-submenu-item', dumpTypeVC.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click().get('input[type=file]').attachFile({ - fileContent, - fileName: annotationVCArchiveName, - }); - }); - }); - confirmUpdate('.cvat-modal-content-load-job-annotation'); + uploadAnnotation( + dumpTypeVC.split(' ')[0], + annotationVCArchiveName, + '.cvat-modal-content-load-job-annotation' + ); cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); + cy.contains('Annotations have been loaded').should('be.visible'); + cy.closeNotification('.ant-notification-notice-info'); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.removeAnnotations(); cy.get('button').contains('Save').click().trigger('mouseout'); @@ -88,22 +97,14 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form .parents('.cvat-tasks-list-item') .find('.cvat-menu-icon') .trigger('mouseover'); - cy.contains('Upload annotations').trigger('mouseover'); - cy.readFile(`cypress/fixtures/${annotationVCArchiveNameCustomeName}`, 'binary') - .then(Cypress.Blob.binaryStringToBlob) - .then((fileContent) => { - cy.contains('.cvat-menu-load-submenu-item', dumpTypeVC.split(' ')[0]) - .should('be.visible') - .within(() => { - cy.get('.cvat-menu-load-submenu-item-button').click().get('input[type=file]').attachFile({ - fileName: annotationVCArchiveNameCustomeName, - fileContent, - }); - }); - }); - confirmUpdate('.cvat-modal-content-load-task-annotation'); + cy.contains('Upload annotations').click(); + uploadAnnotation( + dumpTypeVC.split(' ')[0], + annotationVCArchiveNameCustomeName, + '.cvat-modal-content-load-task-annotation' + ); cy.contains('Annotations have been loaded').should('be.visible'); - cy.get('[data-icon="close"]').click(); + cy.closeNotification('.ant-notification-notice-info'); cy.openTaskJob(taskName); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.removeAnnotations(); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 1df260583f3..6ccd0f28341 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -901,6 +901,11 @@ Cypress.Commands.add('deleteFrame', (action = 'delete') => { cy.wait('@patchMeta').its('response.statusCode').should('equal', 200); }); +Cypress.Commands.add('verifyNotification', () => { + cy.get('.ant-notification-notice-info').should('be.visible'); + cy.closeNotification('.ant-notification-notice-info'); +}); + Cypress.Commands.overwrite('visit', (orig, url, options) => { orig(url, options); cy.closeModalUnsupportedPlatform(); diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 4b14752c730..21efb8b4f14 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -183,8 +183,7 @@ Cypress.Commands.add('waitForDownload', () => { cy.getDownloadFileName().then((filename) => { cy.verifyDownload(filename); }); - cy.get('.ant-notification-notice-info').should('be.visible'); - cy.closeNotification('.ant-notification-notice-info'); + cy.verifyNotification(); }); Cypress.Commands.add('deleteProjectViaActions', (projectName) => { From 3600de425e5146c8bf31e61a01a085a521d3941a Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 12 Aug 2022 09:50:33 +0200 Subject: [PATCH 08/60] Remove unused code --- cvat-ui/src/actions/tasks-actions.ts | 61 ----------------- .../components/actions-menu/actions-menu.tsx | 1 - .../components/actions-menu/load-submenu.tsx | 68 ------------------- .../src/components/actions-menu/styles.scss | 18 +---- .../containers/actions-menu/actions-menu.tsx | 5 -- cvat-ui/src/reducers/tasks-reducer.ts | 34 ---------- 6 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 cvat-ui/src/components/actions-menu/load-submenu.tsx diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index 123f83c269d..735c26222f7 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -16,9 +16,6 @@ export enum TasksActionTypes { GET_TASKS = 'GET_TASKS', GET_TASKS_SUCCESS = 'GET_TASKS_SUCCESS', GET_TASKS_FAILED = 'GET_TASKS_FAILED', - LOAD_ANNOTATIONS = 'LOAD_ANNOTATIONS', - LOAD_ANNOTATIONS_SUCCESS = 'LOAD_ANNOTATIONS_SUCCESS', - LOAD_ANNOTATIONS_FAILED = 'LOAD_ANNOTATIONS_FAILED', DELETE_TASK = 'DELETE_TASK', DELETE_TASK_SUCCESS = 'DELETE_TASK_SUCCESS', DELETE_TASK_FAILED = 'DELETE_TASK_FAILED', @@ -98,64 +95,6 @@ export function getTasksAsync(query: TasksQuery, updateQuery = true): ThunkActio }; } -function loadAnnotations(task: any, loader: any): AnyAction { - const action = { - type: TasksActionTypes.LOAD_ANNOTATIONS, - payload: { - task, - loader, - }, - }; - - return action; -} - -function loadAnnotationsSuccess(task: any): AnyAction { - const action = { - type: TasksActionTypes.LOAD_ANNOTATIONS_SUCCESS, - payload: { - task, - }, - }; - - return action; -} - -function loadAnnotationsFailed(task: any, error: any): AnyAction { - const action = { - type: TasksActionTypes.LOAD_ANNOTATIONS_FAILED, - payload: { - task, - error, - }, - }; - - return action; -} - -export function loadAnnotationsAsync( - task: any, - loader: any, - file: File, -): ThunkAction, {}, {}, AnyAction> { - return async (dispatch: ActionCreator): Promise => { - try { - const store = getCVATStore(); - const state: CombinedState = store.getState(); - if (state.tasks.activities.loads[task.id]) { - throw Error('Only one loading of annotations for a task allowed at the same time'); - } - dispatch(loadAnnotations(task, loader)); - await task.annotations.upload(file, loader); - } catch (error) { - dispatch(loadAnnotationsFailed(task, error)); - return; - } - - dispatch(loadAnnotationsSuccess(task)); - }; -} - function deleteTask(taskID: number): AnyAction { const action = { type: TasksActionTypes.DELETE_TASK, diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx index ae9b65e7d6f..8793c87fd07 100644 --- a/cvat-ui/src/components/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/components/actions-menu/actions-menu.tsx @@ -32,7 +32,6 @@ export enum Actions { MOVE_TASK_TO_PROJECT = 'move_task_to_project', OPEN_BUG_TRACKER = 'open_bug_tracker', EXPORT_TASK = 'export_task', - IMPORT_TASK = 'import_task', } function ActionsMenuComponent(props: Props): JSX.Element { diff --git a/cvat-ui/src/components/actions-menu/load-submenu.tsx b/cvat-ui/src/components/actions-menu/load-submenu.tsx deleted file mode 100644 index 801ed15f9bb..00000000000 --- a/cvat-ui/src/components/actions-menu/load-submenu.tsx +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2020-2022 Intel Corporation -// -// SPDX-License-Identifier: MIT - -import React from 'react'; -import Menu from 'antd/lib/menu'; -import Upload from 'antd/lib/upload'; -import Button from 'antd/lib/button'; -import Text from 'antd/lib/typography/Text'; -import { UploadOutlined, LoadingOutlined } from '@ant-design/icons'; -import { DimensionType } from '../../reducers/interfaces'; - -interface Props { - menuKey: string; - loaders: any[]; - loadActivity: string | null; - onFileUpload(format: string, file: File): void; - taskDimension: DimensionType; -} - -export default function LoadSubmenu(props: Props): JSX.Element { - const { - menuKey, loaders, loadActivity, onFileUpload, taskDimension, - } = props; - - return ( - - {loaders - .sort((a: any, b: any) => a.name.localeCompare(b.name)) - .filter((loader: any): boolean => loader.dimension === taskDimension) - .map( - (loader: any): JSX.Element => { - const accept = loader.format - .split(',') - .map((x: string) => `.${x.trimStart()}`) - .join(', '); // add '.' to each extension in a list - const pending = loadActivity === loader.name; - const disabled = !loader.enabled || !!loadActivity; - const format = loader.name; - return ( - - { - onFileUpload(format, file); - return false; - }} - > - - - - ); - }, - )} - - ); -} diff --git a/cvat-ui/src/components/actions-menu/styles.scss b/cvat-ui/src/components/actions-menu/styles.scss index 25240c9c654..1742bc81a80 100644 --- a/cvat-ui/src/components/actions-menu/styles.scss +++ b/cvat-ui/src/components/actions-menu/styles.scss @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -17,7 +18,6 @@ } } -.cvat-menu-load-submenu-item, .cvat-menu-dump-submenu-item, .cvat-menu-export-submenu-item { > span[role='img'] { @@ -29,22 +29,6 @@ } } -.ant-menu-item.cvat-menu-load-submenu-item { - margin: 0; - padding: 0; - - > span > .ant-upload { - width: 100%; - height: 100%; - - > span > button { - width: 100%; - height: 100%; - text-align: left; - } - } -} - .cvat-menu-icon { font-size: 16px; margin-left: 8px; diff --git a/cvat-ui/src/containers/actions-menu/actions-menu.tsx b/cvat-ui/src/containers/actions-menu/actions-menu.tsx index e4a8339b6f1..e4a21cb6be1 100644 --- a/cvat-ui/src/containers/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/containers/actions-menu/actions-menu.tsx @@ -11,7 +11,6 @@ import ActionsMenuComponent, { Actions } from 'components/actions-menu/actions-m import { CombinedState } from 'reducers/interfaces'; import { modelsActions } from 'actions/models-actions'; import { - loadAnnotationsAsync, deleteTaskAsync, switchMoveTaskModalVisible, } from 'actions/tasks-actions'; @@ -30,7 +29,6 @@ interface StateToProps { } interface DispatchToProps { - loadAnnotations: (taskInstance: any, loader: any, file: File) => void; showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null) => void; showImportModal: (taskInstance: any, isDataset: boolean) => void; openRunModelWindow: (taskInstance: any) => void; @@ -59,9 +57,6 @@ function mapStateToProps(state: CombinedState, own: OwnProps): StateToProps { function mapDispatchToProps(dispatch: any): DispatchToProps { return { - loadAnnotations: (taskInstance: any, loader: any, file: File): void => { - dispatch(loadAnnotationsAsync(taskInstance, loader, file)); - }, showExportModal: (taskInstance: any, resource: 'dataset' | 'backup' | null): void => { dispatch(exportActions.openExportModal(taskInstance, resource)); }, diff --git a/cvat-ui/src/reducers/tasks-reducer.ts b/cvat-ui/src/reducers/tasks-reducer.ts index a36f786066a..c7967c814cb 100644 --- a/cvat-ui/src/reducers/tasks-reducer.ts +++ b/cvat-ui/src/reducers/tasks-reducer.ts @@ -81,40 +81,6 @@ export default (state: TasksState = defaultState, action: AnyAction): TasksState initialized: true, fetching: false, }; - case TasksActionTypes.LOAD_ANNOTATIONS: { - const { task } = action.payload; - const { loader } = action.payload; - const { loads } = state.activities; - - loads[task.id] = task.id in loads ? loads[task.id] : loader.name; - - return { - ...state, - activities: { - ...state.activities, - loads: { - ...loads, - }, - }, - }; - } - case TasksActionTypes.LOAD_ANNOTATIONS_FAILED: - case TasksActionTypes.LOAD_ANNOTATIONS_SUCCESS: { - const { task } = action.payload; - const { loads } = state.activities; - - delete loads[task.id]; - - return { - ...state, - activities: { - ...state.activities, - loads: { - ...loads, - }, - }, - }; - } case TasksActionTypes.DELETE_TASK: { const { taskID } = action.payload; const { deletes } = state.activities; From b1de375be28e6698398c1e587610d3fb9d1b9fa1 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 17 Aug 2022 15:32:16 +0200 Subject: [PATCH 09/60] Fix part of comments --- cvat-core/src/annotations.ts | 42 ++-- cvat-core/src/enums.ts | 8 +- cvat-core/src/project-implementation.ts | 31 ++- cvat-core/src/project.ts | 49 ++--- cvat-core/src/server-proxy.ts | 206 ++++++++++-------- cvat-core/src/session.ts | 73 +++++-- cvat-core/src/storage.ts | 112 +++++----- cvat-ui/src/actions/export-actions.ts | 11 +- cvat-ui/src/actions/import-actions.ts | 16 +- cvat-ui/src/actions/import-backup-actions.ts | 4 +- .../export-backup/export-backup-modal.tsx | 8 +- .../export-dataset/export-dataset-modal.tsx | 31 +-- .../import-backup/import-backup-modal.tsx | 29 +-- .../import-dataset/import-dataset-modal.tsx | 2 +- cvat-ui/src/reducers/interfaces.ts | 2 +- cvat/apps/engine/backup.py | 2 +- cvat/apps/engine/views.py | 2 +- 17 files changed, 331 insertions(+), 297 deletions(-) diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index 5027c7dc465..08bf9421806 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -11,7 +11,6 @@ const { checkObjectType } = require('./common'); const { Project } = require('./project'); const { Task, Job } = require('./session'); - const { Loader } = require('./annotation-formats'); const { ScriptingError, DataError, ArgumentError } = require('./exceptions'); const { getDeletedFrames } = require('./frames'); @@ -224,9 +223,15 @@ ); } - async function uploadAnnotations(session, format, useDefaultLocation, sourceStorage, file, fileName) { + async function uploadAnnotations( + session, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string + ) { const sessionType = session instanceof Task ? 'task' : 'job'; - await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file, fileName); + await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file); } function importAnnotations(session, data) { @@ -256,30 +261,32 @@ ); } - async function exportDataset(instance, format, name, saveImages = false, targetStorage = null) { - if (!(format instanceof String || typeof format === 'string')) { - throw new ArgumentError('Format must be a string'); - } + async function exportDataset( + instance, + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + name?: string, + ) { if (!(instance instanceof Task || instance instanceof Project || instance instanceof Job)) { throw new ArgumentError('A dataset can only be created from a job, task or project'); } - if (typeof saveImages !== 'boolean') { - throw new ArgumentError('Save images parameter must be a boolean'); - } let result = null; if (instance instanceof Task) { - result = await serverProxy.tasks.exportDataset(instance.id, format, name, saveImages, targetStorage); + result = await serverProxy.tasks.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); } else if (instance instanceof Job) { - result = await serverProxy.jobs.exportDataset(instance.id, format, name, saveImages, targetStorage); + result = await serverProxy.jobs.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); } else { - result = await serverProxy.projects.exportDataset(instance.id, format, name, saveImages, targetStorage); + result = await serverProxy.projects.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); } return result; } - function importDataset(instance, format, useDefaultSettings, sourceStorage, file = null, fileName = null, updateStatusCallback = () => {}) { + function importDataset(instance, format: string, useDefaultSettings: boolean, sourceStorage: Storage, + file: File | string, updateStatusCallback = () => {}) { if (!(typeof format === 'string')) { throw new ArgumentError('Format must be a string'); } @@ -289,10 +296,13 @@ if (!(typeof updateStatusCallback === 'function')) { throw new ArgumentError('Callback should be a function'); } - if (!((fileName || file.name).endsWith('.zip'))) { + if (typeof file === 'string' && !file.endsWith('.zip')) { + throw new ArgumentError('File should be file instance with ZIP extension'); + } + if (file instanceof File && !(['application/zip', 'application/x-zip-compressed'].includes(file.type))) { throw new ArgumentError('File should be file instance with ZIP extension'); } - return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, fileName, updateStatusCallback); + return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); } function getHistory(session) { diff --git a/cvat-core/src/enums.ts b/cvat-core/src/enums.ts index bdb32f90e22..3a7dfb5ffae 100644 --- a/cvat-core/src/enums.ts +++ b/cvat-core/src/enums.ts @@ -436,10 +436,10 @@ * @property {string} CLOUD_STORAGE 'cloud_storage' * @readonly */ - const StorageLocation = Object.freeze({ - LOCAL: 'local', - CLOUD_STORAGE: 'cloud_storage', - }); + enum StorageLocation { + LOCAL = 'local', + CLOUD_STORAGE = 'cloud_storage', + } module.exports = { ShareFileType, diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index bde49d24418..d8328df65e6 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -8,7 +8,6 @@ const { getPreview } = require('./frames'); const { Project } = require('./project'); - const { Storage } = require('./storage'); const { exportDataset, importDataset } = require('./annotations'); function implementProject(projectClass) { @@ -71,32 +70,32 @@ }; projectClass.prototype.annotations.exportDataset.implementation = async function ( - format, - saveImages, - customName, - targetStorage + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string ) { - const result = exportDataset(this, format, customName, saveImages, targetStorage); + const result = exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; }; projectClass.prototype.annotations.importDataset.implementation = async function ( - format, - useDefaultSettings, - sourceStorage, - file, - fileName, + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string, updateStatusCallback ) { - return importDataset(this, format, useDefaultSettings, sourceStorage, file, fileName, updateStatusCallback); + return importDataset(this, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); }; - projectClass.prototype.export.implementation = async function (fileName: string, targetStorage: Storage | null) { - const result = await serverProxy.projects.export(this.id, fileName, targetStorage); + projectClass.prototype.export.implementation = async function (targetStorage: Storage, fileName?: string) { + const result = await serverProxy.projects.export(this.id, targetStorage, fileName); return result; }; - projectClass.import.implementation = async function (storage, file, fileName) { - const result = await serverProxy.projects.import(storage, file, fileName); + projectClass.import.implementation = async function (storage: Storage, file: File | string) { + const result = await serverProxy.projects.import(storage, file); return result; }; diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index dbe87a1f520..19f47689f58 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -9,7 +9,6 @@ const { Label } = require('./labels'); const User = require('./user'); const { FieldUpdateTrigger } = require('./common'); - const { Storage } = require('./storage'); /** * Class representing a project @@ -251,34 +250,22 @@ * @name sourceStorage * @type {module:API.cvat.classes.Storage} * @memberof module:API.cvat.classes.Project + * @readonly * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} */ sourceStorage: { get: () => data.source_storage, - set: (sourceStorage) => { - if (typeof sourceStorage !== Storage) { - throw new ArgumentError('Type of value must be Storage'); - } - data.source_storage = sourceStorage; - }, }, /** * Target storage for export resources. * @name targetStorage * @type {module:API.cvat.classes.Storage} * @memberof module:API.cvat.classes.Project + * @readonly * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} */ targetStorage: { get: () => data.target_storage, - set: (targetStorage) => { - if (typeof targetStorage !== Storage) { - throw new ArgumentError('Type of value must be Storage'); - } - data.target_storage = targetStorage; - }, }, _internalData: { get: () => data, @@ -356,12 +343,12 @@ * @throws {module:API.cvat.exceptions.PluginError} * @returns {string} URL to get result archive */ - async export(fileName: string, targetStorage: Storage | null) { + async export(targetStorage: Storage, fileName?: string) { const result = await PluginRegistry.apiWrapper.call( this, Project.prototype.export, - fileName, - targetStorage + targetStorage, + fileName ); return result; } @@ -377,8 +364,8 @@ * @throws {module:API.cvat.exceptions.PluginError} * @returns {number} ID of the imported project */ - static async import(storage, file, fileName) { - const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file, fileName); + static async import(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file); return result; } } @@ -388,18 +375,31 @@ Object.freeze({ annotations: Object.freeze({ value: { - async exportDataset(format, saveImages, customName = '', targetStorage = null) { + async exportDataset( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { const result = await PluginRegistry.apiWrapper.call( this, Project.prototype.annotations.exportDataset, format, saveImages, - customName, - targetStorage + useDefaultSettings, + targetStorage, + customName ); return result; }, - async importDataset(format, useDefaultSettings, sourceStorage, file = null, fileName = null, updateStatusCallback = null) { + async importDataset( + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string, + updateStatusCallback = null + ) { const result = await PluginRegistry.apiWrapper.call( this, Project.prototype.annotations.importDataset, @@ -407,7 +407,6 @@ useDefaultSettings, sourceStorage, file, - fileName, updateStatusCallback ); return result; diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index 26c2b5978ef..0fa429616d0 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -3,6 +3,18 @@ // // SPDX-License-Identifier: MIT +import { Storage, StorageLocation } from "enums"; + +type Params = { + org: number | string, + use_default_location: boolean, + location?: StorageLocation, + cloud_storage_id?: number, + format?: string, + filename?: string, + action?: string, +} + (() => { const FormData = require('form-data'); const { ServerError } = require('./exceptions'); @@ -16,16 +28,16 @@ return { org: config.organizationID || '' }; } - function configureStorage(useDefaultLocation: boolean | null, storage: any) { - const params: any = { use_default_location: useDefaultLocation, }; - if (!useDefaultLocation) { - params.location = storage.location; - if (storage.cloudStorageId) { - params.cloud_storage_id = storage.cloudStorageId; - } - } - - return params; + function configureStorage(storage: Storage = { location: StorageLocation.LOCAL }, useDefaultLocation: boolean = false) { + return { + use_default_location: useDefaultLocation, + ...(!useDefaultLocation ? { + location: storage.location, + ...(storage.cloudStorageId ? { + cloud_storage_id: storage.cloudStorageId, + } : {}) + } : {}) + }; } function removeToken() { @@ -594,38 +606,38 @@ } function exportDataset(instanceType) { - return async function (id, format, name, saveImages, targetStorage = null) { + return async function ( + id: number, + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + name?: string + ) { const { backendAPI } = config; const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; - const params: any = { + const params: Params = { ...enableOrganization(), - ...configureStorage(!targetStorage?.location, targetStorage), + ...configureStorage(targetStorage, useDefaultSettings), + ...(name ? { filename: name.replace(/\//g, '_') } : {}), format, }; - if (name) { - params.filename = name.replace(/\//g, '_'); - } - - - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { async function request() { Axios.get(baseURL, { proxy: config.proxy, params, }) .then((response) => { - if (response.status === 202) { + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { setTimeout(request, 3000); - } else if (response.status === 201) { - params.action = 'download'; - if (response.data['location'] === 'cloud_storage') { - setTimeout(request, 3000); - } - else { - resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); - } - } else { + } else if (status === 201) { + resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { resolve(); } }) @@ -639,20 +651,26 @@ }; } - async function importDataset(id, format, useDefaultLocation, sourceStorage, file, fileName, onUpdate) { + async function importDataset( + id: number, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string, + onUpdate + ) { const { backendAPI, origin } = config; - const params: any = { + const params: Params = { ...enableOrganization(), - ...configureStorage(useDefaultLocation, sourceStorage), + ...configureStorage(sourceStorage, useDefaultLocation), format, - filename: (file) ? file.name : fileName, + filename: typeof file === 'string' ? file : file.name, }; - const url = `${backendAPI}/projects/${id}/dataset`; async function wait() { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { async function requestStatus() { try { const response = await Axios.get(url, { @@ -676,8 +694,9 @@ setTimeout(requestStatus, 2000); }); } + const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; - if (sourceStorage.location === 'cloud_storage') { + if (isCloudStorage) { try { await Axios.post(url, new FormData(), { @@ -692,7 +711,7 @@ chunkSize: config.uploadChunkSize * 1024 * 1024, endpoint: `${origin}${backendAPI}/projects/${id}/dataset/`, totalSentSize: 0, - totalSize: file.size, + totalSize: (file as File).size, onUpdate: (percentage) => { onUpdate('The dataset is being uploaded to the server', percentage); }, @@ -717,38 +736,36 @@ } } try { - return await wait(); + return wait(); } catch (errorData) { throw generateError(errorData); } } - async function exportTask(id, fileName, targetStorage) { + async function exportTask(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { const { backendAPI } = config; - const params: any = { + const params: Params = { ...enableOrganization(), - ...configureStorage(!targetStorage, targetStorage), - filename: fileName, + ...configureStorage(targetStorage, useDefaultSettings), + ...(fileName ? { filename: fileName } : {}) }; const url = `${backendAPI}/tasks/${id}/backup`; - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { async function request() { try { const response = await Axios.get(url, { proxy: config.proxy, params, }); - if (response.status === 202) { + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { setTimeout(request, 3000); - } else if (response.status === 201) { - params.action = 'download'; - if (response.data['location'] === 'cloud_storage') { - setTimeout(request, 3000); - } else { - resolve(`${url}?${new URLSearchParams(params).toString()}`); - } - } else { + } else if (status === 201) { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { resolve(); } } catch (errorData) { @@ -760,12 +777,12 @@ }); } - async function importTask(storage, file, fileName) { + async function importTask(storage: Storage, file: File | string) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request - const params: any = { + const params: Params = { ...enableOrganization(), - location: storage.location, + ...configureStorage(storage), }; const url = `${backendAPI}/tasks/backup`; @@ -795,13 +812,10 @@ setTimeout(checkStatus); }); } + const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; - if (storage.cloudStorageId) { - params.cloud_storage_id = storage.cloudStorageId; - } - - if (storage.location === 'cloud_storage') { - params.filename = fileName; + if (isCloudStorage) { + params.filename = file as string; response = await Axios.post(url, new FormData(), { params, @@ -812,7 +826,7 @@ chunkSize: config.uploadChunkSize * 1024 * 1024, endpoint: `${origin}${backendAPI}/tasks/backup/`, totalSentSize: 0, - totalSize: file.size, + totalSize: (file as File).size, }; await Axios.post(url, new FormData(), { @@ -828,37 +842,35 @@ headers: { 'Upload-Finish': true }, }); } - return await wait(taskData, response); + return wait(taskData, response); } - async function exportProject(id, fileName: string, targetStorage: any) { + async function exportProject(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request - const params: any = { + const params: Params = { ...enableOrganization(), - ...configureStorage(!targetStorage, targetStorage), - filename: fileName, + ...configureStorage(targetStorage, useDefaultSettings), + ...(fileName ? { filename: fileName } : {}) }; const url = `${backendAPI}/projects/${id}/backup`; - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { async function request() { try { const response = await Axios.get(url, { proxy: config.proxy, params, }); - if (response.status === 202) { + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { setTimeout(request, 3000); - } else if (response.status === 201) { - params.action = 'download'; - if (response.data['location'] === 'cloud_storage') { - setTimeout(request, 3000); - } else { - resolve(`${url}?${new URLSearchParams(params).toString()}`); - } - } else { + } else if (status === 201) { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { resolve(); } } catch (errorData) { @@ -870,15 +882,12 @@ }); } - async function importProject(storage, file, fileName) { + async function importProject(storage: Storage, file: File | string) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request - const params: any = { + const params: Params = { ...enableOrganization(), - location: storage.location, - } - if (storage.cloudStorageId) { - params.cloud_storage_id = storage.cloudStorageId; + ...configureStorage(storage), } const url = `${backendAPI}/projects/backup`; @@ -909,9 +918,10 @@ setTimeout(request); }); }; + const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; - if (storage.location === 'cloud_storage') { - params.filename = fileName; + if (isCloudStorage) { + params.filename = file; response = await Axios.post(url, new FormData(), { params, @@ -922,7 +932,7 @@ chunkSize: config.uploadChunkSize * 1024 * 1024, endpoint: `${origin}${backendAPI}/projects/backup/`, totalSentSize: 0, - totalSize: file.size, + totalSize: (file as File).size, }; await Axios.post(url, new FormData(), { @@ -939,7 +949,7 @@ } ); } - return await wait(projectData, response); + return wait(projectData, response); } async function createTask(taskSpec, taskDataSpec, onUpdate) { @@ -1415,19 +1425,26 @@ } // Session is 'task' or 'job' - async function uploadAnnotations(session, id, format, useDefaultLocation, sourceStorage, file, fileName) { + async function uploadAnnotations( + session, + id: number, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string + ) { const { backendAPI, origin } = config; - const params: any = { + const params: Params = { ...enableOrganization(), - ...configureStorage(useDefaultLocation, sourceStorage), + ...configureStorage(sourceStorage, useDefaultLocation), format, - filename: (file) ? file.name : fileName, + filename: typeof file === 'string' ? file : file.name, }; const url = `${backendAPI}/${session}s/${id}/annotations`; async function wait() { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { async function requestStatus() { try { const response = await Axios.put( @@ -1450,8 +1467,9 @@ setTimeout(requestStatus); }); } + const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; - if (sourceStorage.location === 'cloud_storage') { + if (isCloudStorage) { try { await Axios.post(url, new FormData(), { @@ -1489,7 +1507,7 @@ } try { - return await wait(); + return wait(); } catch (errorData) { throw generateError(errorData); } diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 5fc2cb3a464..9262b4d709f 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -26,14 +26,13 @@ const { Label } = require('./labels'); const User = require('./user'); const Issue = require('./issue'); - const { Storage } = require('./storage'); const { FieldUpdateTrigger, checkObjectType } = require('./common'); function buildDuplicatedAPI(prototype) { Object.defineProperties(prototype, { annotations: Object.freeze({ value: { - async upload(format, useDefaultLocation, sourceStorage, file, fileName) { + async upload(format: string, useDefaultLocation: boolean, sourceStorage: Storage, file: File | string) { const result = await PluginRegistry.apiWrapper.call( this, prototype.annotations.upload, @@ -41,7 +40,6 @@ useDefaultLocation, sourceStorage, file, - fileName, ); return result; }, @@ -156,14 +154,21 @@ return result; }, - async exportDataset(format, saveImages, customName = '', targetStorage = null) { + async exportDataset( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { const result = await PluginRegistry.apiWrapper.call( this, prototype.annotations.exportDataset, format, saveImages, - customName, - targetStorage + useDefaultSettings, + targetStorage, + customName ); return result; }, @@ -1897,12 +1902,12 @@ * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - async export(fileName: string, targetStorage: Storage | null) { + async export(targetStorage: Storage, fileName?: string) { const result = await PluginRegistry.apiWrapper.call( this, Task.prototype.export, - fileName, - targetStorage + targetStorage, + fileName ); return result; } @@ -1917,8 +1922,8 @@ * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - static async import(storage, file, fileName) { - const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file, fileName); + static async import(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file); return result; } } @@ -2214,8 +2219,13 @@ return result; }; - Job.prototype.annotations.upload.implementation = async function (format, useDefaultLocation, sourceStorage, file, fileName) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file, fileName); + Job.prototype.annotations.upload.implementation = async function ( + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string + ) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); return result; }; @@ -2229,8 +2239,14 @@ return result; }; - Job.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName, targetStorage) { - const result = await exportDataset(this, format, customName, saveImages, targetStorage); + Job.prototype.annotations.exportDataset.implementation = async function ( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { + const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; }; @@ -2402,14 +2418,14 @@ return result; }; - Task.prototype.export.implementation = async function (fileName: string, targetStorage: Storage | null) { - const result = await serverProxy.tasks.export(this.id, fileName, targetStorage); + Task.prototype.export.implementation = async function (targetStorage: Storage, fileName?: string) { + const result = await serverProxy.tasks.export(this.id, targetStorage, fileName); return result; }; - Task.import.implementation = async function (storage, file, fileName) { + Task.import.implementation = async function (storage: Storage, file: File | string) { // eslint-disable-next-line no-unsanitized/method - const result = await serverProxy.tasks.import(storage, file, fileName); + const result = await serverProxy.tasks.import(storage, file); return result; }; @@ -2636,8 +2652,13 @@ return result; }; - Task.prototype.annotations.upload.implementation = async function (format, useDefaultLocation, sourceStorage, file, fileName) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file, fileName); + Task.prototype.annotations.upload.implementation = async function ( + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string + ) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); return result; }; @@ -2651,8 +2672,14 @@ return result; }; - Task.prototype.annotations.exportDataset.implementation = async function (format, saveImages, customName, targetStorage) { - const result = await exportDataset(this, format, customName, saveImages, targetStorage); + Task.prototype.annotations.exportDataset.implementation = async function ( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { + const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; }; diff --git a/cvat-core/src/storage.ts b/cvat-core/src/storage.ts index 11da0ed6fee..1d3e90b075a 100644 --- a/cvat-core/src/storage.ts +++ b/cvat-core/src/storage.ts @@ -2,71 +2,63 @@ // // SPDX-License-Identifier: MIT +import { StorageLocation } from 'enums'; -(() => { - const { ArgumentError } = require('./exceptions'); - const { StorageLocation } = require('./enums'); +/** + * Class representing a storage for import and export resources + * @memberof module:API.cvat.classes + * @hideconstructor + */ +export default class Storage { + public location: StorageLocation; + public cloudStorageId: number; + constructor(initialData) { + const data = { + location: undefined, + cloud_storage_id: undefined, + }; - /** - * Class representing a storage for import and export resources - * @memberof module:API.cvat.classes - * @hideconstructor - */ - class Storage { - location: typeof StorageLocation; - cloudStorageId: number; - constructor(initialData) { - const data = { - location: undefined, - cloud_storage_id: undefined, - }; - - for (const key in data) { - if (Object.prototype.hasOwnProperty.call(data, key)) { - if (Object.prototype.hasOwnProperty.call(initialData, key)) { - data[key] = initialData[key]; - } + for (const key in data) { + if (Object.prototype.hasOwnProperty.call(data, key)) { + if (Object.prototype.hasOwnProperty.call(initialData, key)) { + data[key] = initialData[key]; } } + } - Object.defineProperties( - this, - Object.freeze({ - /** - * @name location - * @type {module:API.cvat.enums.StorageLocation} - * @memberof module:API.cvat.classes.Storage - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - location: { - get: () => data.location, - set: (key) => { - if (key !== undefined && !!StorageLocation[key]) { - data.location = StorageLocation[key]; - } else { - throw new ArgumentError('Value must be one of the StorageLocation keys'); - } - }, + Object.defineProperties( + this, + Object.freeze({ + /** + * @name location + * @type {module:API.cvat.enums.StorageLocation} + * @memberof module:API.cvat.classes.Storage + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + location: { + get: () => data.location, + set: (key) => { + if (key !== undefined && !!StorageLocation[key]) { + data.location = StorageLocation[key]; + } else { + throw new ArgumentError('Value must be one of the StorageLocation keys'); + } }, - /** - * @name cloudStorageId - * @type {number} - * @memberof module:API.cvat.classes.Storage - * @instance - */ - cloudStorageId: { - get: () => data.cloud_storage_id, - set: (cloudStorageId) => { - data.cloud_storage_id = cloudStorageId; - }, + }, + /** + * @name cloudStorageId + * @type {number} + * @memberof module:API.cvat.classes.Storage + * @instance + */ + cloudStorageId: { + get: () => data.cloud_storage_id, + set: (cloudStorageId) => { + data.cloud_storage_id = cloudStorageId; }, - }), - ); - } + }, + }), + ); } - - module.exports = { - Storage, - }; -})(); +} \ No newline at end of file diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 105952b77aa..4eadfa2d38d 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -53,14 +53,15 @@ export const exportActions = { export const exportDatasetAsync = ( instance: any, format: string, - name: string, saveImages: boolean, - targetStorage: Storage | null, + useDefaultSettings: boolean, + targetStorage: Storage, + name?: string ): ThunkAction => async (dispatch) => { dispatch(exportActions.exportDataset(instance, format)); try { - const result = await instance.annotations.exportDataset(format, saveImages, name, targetStorage); + const result = await instance.annotations.exportDataset(format, saveImages, useDefaultSettings, targetStorage, name); if (result) { const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; downloadAnchor.href = result; @@ -72,12 +73,12 @@ export const exportDatasetAsync = ( } }; -export const exportBackupAsync = (instance: any, fileName: string, targetStorage: Storage | null): ThunkAction => async (dispatch) => { +export const exportBackupAsync = (instance: any, targetStorage: Storage, fileName?: string): ThunkAction => async (dispatch) => { dispatch(exportActions.exportBackup(instance.id)); const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; try { - const result = await instance.export(fileName, targetStorage); + const result = await instance.export(targetStorage, fileName); if (result) { const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; downloadAnchor.href = result; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 093dd2ea4ae..80cda7ebd1a 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -46,7 +46,13 @@ export const importActions = { ), }; -export const importDatasetAsync = (instance: any, format: string, useDefaultSettings: boolean, sourceStorage: Storage, file: File | null, fileName: string | null): ThunkAction => ( +export const importDatasetAsync = ( + instance: any, + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string +): ThunkAction => ( async (dispatch, getState) => { const resource = instance instanceof core.classes.Project ? 'dataset' : 'annotation'; @@ -58,7 +64,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); - await instance.annotations.importDataset(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( + await instance.annotations.importDataset(format, useDefaultSettings, sourceStorage, file, (message: string, progress: number) => ( dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) )); } else if (instance instanceof core.classes.Task) { @@ -66,9 +72,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); - await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName, (message: string, progress: number) => ( - dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) - )); + await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file); } else { // job if (state.import.tasks?.activities[instance.taskId]) { throw Error('Annotations is being uploaded for the task'); @@ -81,7 +85,7 @@ export const importDatasetAsync = (instance: any, format: string, useDefaultSett dispatch(importActions.importDataset(instance, format)); const frame = state.annotation.player.frame.number; - await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file, fileName); + await instance.annotations.upload(format, useDefaultSettings, sourceStorage, file); await instance.logger.log(LogType.uploadAnnotations, { ...(await jobInfoGenerator(instance)), diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index 6025bd15a0f..ee79fb0abd3 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -30,12 +30,12 @@ export const importBackupActions = { ), }; -export const importBackupAsync = (instanceType: 'project' | 'task', storage: Storage, file: File | null, fileName: string | null): ThunkAction => ( +export const importBackupAsync = (instanceType: 'project' | 'task', storage: Storage, file: File | string): ThunkAction => ( async (dispatch) => { dispatch(importBackupActions.importBackup()); try { const inctanceClass = (instanceType === 'task') ? core.classes.Task : core.classes.Project; - const instance = await inctanceClass.import(storage, file, fileName); + const instance = await inctanceClass.import(storage, file); dispatch(importBackupActions.importBackupSuccess(instance.id, instanceType)); } catch (error) { dispatch(importBackupActions.importBackupFailed(instanceType, error)); diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index b3d2e85218a..cdc48572241 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -99,11 +99,11 @@ function ExportBackupModal(): JSX.Element | null { dispatch( exportBackupAsync( instance, - values.customName ? `${values.customName}.zip` : '', - (useDefaultStorage) ? null : { - location: values.targetStorage?.location, - cloudStorageId: values.targetStorage?.cloud_storage_id, + { + location: useDefaultStorage ? defaultStorageLocation : values.targetStorage?.location, + cloudStorageId: useDefaultStorage ? defaultStorageCloudId : values.targetStorage?.cloud_storage_id, } as Storage, + values.customName ? `${values.customName}.zip` : undefined ), ); closeModal(); diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 5a85e5612ee..defb040f9b7 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -46,7 +46,9 @@ function ExportDatasetModal(): JSX.Element | null { const [activities, setActivities] = useState([]); const [useDefaultTargetStorage, setUseDefaultTargetStorage] = useState(true); const [form] = Form.useForm(); - const [targetStorage, setTargetStorage] = useState(null); + const [targetStorage, setTargetStorage] = useState({ + location: StorageLocation.LOCAL, + }); const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); const [helpMessage, setHelpMessage] = useState(''); @@ -64,19 +66,14 @@ function ExportDatasetModal(): JSX.Element | null { if (instance instanceof core.classes.Project) { setInstanceType(`project #${instance.id}`); setActivities(projectExportActivities[instance.id]?.dataset || []); - // TODO need refactoring - } else if (instance instanceof core.classes.Task) { - const taskID = instance.id; - setInstanceType(`task #${taskID}`); - setActivities(taskExportActivities[taskID]?.dataset || []); - if (instance.mode === 'interpolation' && instance.dimension === '2d') { - form.setFieldsValue({ selectedFormat: 'CVAT for video 1.1' }); - } else if (instance.mode === 'annotation' && instance.dimension === '2d') { - form.setFieldsValue({ selectedFormat: 'CVAT for images 1.1' }); + } else if (instance instanceof core.classes.Task || instance instanceof core.classes.Job) { + if (instance instanceof core.classes.Task) { + setInstanceType(`task #${instance.id}`); + setActivities(taskExportActivities[instance.id]?.dataset || []); + } else { + setInstanceType(`job #${instance.id}`); + setActivities(jobExportActivities[instance.id]?.dataset || []); } - } else if (instance instanceof core.classes.Job) { - setInstanceType(`job #${instance.id}`); - setActivities(jobExportActivities[instance.id]?.dataset || []); if (instance.mode === 'interpolation' && instance.dimension === '2d') { form.setFieldsValue({ selectedFormat: 'CVAT for video 1.1' }); } else if (instance.mode === 'annotation' && instance.dimension === '2d') { @@ -133,9 +130,13 @@ function ExportDatasetModal(): JSX.Element | null { exportDatasetAsync( instance, values.selectedFormat as string, - values.customName ? `${values.customName}.zip` : '', values.saveImages, - targetStorage, + useDefaultTargetStorage, + useDefaultTargetStorage ? { + location: defaultStorageLocation, + cloud_storage_id: defaultStorageCloudId, + }: targetStorage, + values.customName ? `${values.customName}.zip` : null, ), ); closeModal(); diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index e56e69413f0..916f37d3be2 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -3,35 +3,21 @@ // SPDX-License-Identifier: MIT import './styles.scss'; -import React, { useCallback, useEffect, useState } from 'react'; +import React, { useCallback, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import Modal from 'antd/lib/modal'; import Form, { RuleObject } from 'antd/lib/form'; import Text from 'antd/lib/typography/Text'; -import Select from 'antd/lib/select'; import Notification from 'antd/lib/notification'; import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; - -import { StorageLocation } from 'reducers/interfaces'; - -import { - UploadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleOutlined, -} from '@ant-design/icons'; - +import { InboxOutlined } from '@ant-design/icons'; import { CombinedState } from 'reducers/interfaces'; import { importBackupActions, importBackupAsync } from 'actions/import-backup-actions'; - -import Space from 'antd/lib/space'; -import Switch from 'antd/lib/switch'; -import Tooltip from 'antd/lib/tooltip'; - -import getCore from 'cvat-core-wrapper'; import SourceStorageField from 'components/storage/source-storage-field'; -import { Storage } from 'reducers/interfaces'; +import { Storage, StorageLocation } from 'reducers/interfaces'; import Input from 'antd/lib/input/Input'; - type FormValues = { fileName?: string | undefined; sourceStorage: any; @@ -50,9 +36,7 @@ function ImportBackupModal(): JSX.Element { const [file, setFile] = useState(null); const instanceType = useSelector((state: CombinedState) => state.importBackup?.instanceType); const modalVisible = useSelector((state: CombinedState) => state.importBackup.modalVisible); - const dispatch = useDispatch(); - const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); const uploadLocalFile = (): JSX.Element => { @@ -120,13 +104,12 @@ function ImportBackupModal(): JSX.Element { }); return; } - const fileName = (values.location === StorageLocation.CLOUD_STORAGE) ? values.fileName : null; const sourceStorage = { - location: values.location, - cloudStorageId: values.cloudStorageId, + location: values.sourceStorage.location, + cloudStorageId: values.sourceStorage.cloud_storage_id, } as Storage; - dispatch(importBackupAsync(instanceType, sourceStorage, file, fileName as string)); + dispatch(importBackupAsync(instanceType, sourceStorage, file || (values.fileName) as string)); Notification.info({ message: `The ${instanceType} creating from the backup has been started`, diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 941e1bae253..284ae96d56b 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -239,7 +239,7 @@ function ImportDatasetModal(): JSX.Element | null { dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, uploadParams.useDefaultSettings, uploadParams.sourceStorage, - uploadParams.file, uploadParams.fileName)); + uploadParams.file || (uploadParams.fileName as string))); const _resource = uploadParams.resource.charAt(0).toUpperCase() + uploadParams.resource.slice(1); Notification.info({ message: `${_resource} import started`, diff --git a/cvat-ui/src/reducers/interfaces.ts b/cvat-ui/src/reducers/interfaces.ts index 8ef2a335609..d0501bd824b 100644 --- a/cvat-ui/src/reducers/interfaces.ts +++ b/cvat-ui/src/reducers/interfaces.ts @@ -778,7 +778,7 @@ export enum StorageLocation { export interface Storage { location: StorageLocation; - cloudStorageId: number | null | undefined; + cloud_storage_id?: number; } export enum ReviewStatus { diff --git a/cvat/apps/engine/backup.py b/cvat/apps/engine/backup.py index ea85850b65d..60e69e4eba8 100644 --- a/cvat/apps/engine/backup.py +++ b/cvat/apps/engine/backup.py @@ -777,7 +777,7 @@ def _export_to_cloud_storage(storage, file_path, file_name): raise NotImplementedError() else: if os.path.exists(file_path): - return Response({'location': location_conf.get('location')}, status=status.HTTP_201_CREATED) + return Response(status=status.HTTP_201_CREATED) elif rq_job.is_failed: exc_info = str(rq_job.exc_info) rq_job.delete() diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index a0d469de87b..f516d86219f 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -2215,7 +2215,7 @@ def _export_annotations(db_instance, rq_id, request, format_name, action, callba raise NotImplementedError() else: if osp.exists(file_path): - return Response({'location': location_conf.get('location')}, status=status.HTTP_201_CREATED) + return Response(status=status.HTTP_201_CREATED) elif rq_job.is_failed: exc_info = str(rq_job.exc_info) rq_job.delete() From 6d50c55fe95d44ca02d7542a43c211b400d065b5 Mon Sep 17 00:00:00 2001 From: Maya Date: Sun, 21 Aug 2022 17:31:24 +0200 Subject: [PATCH 10/60] Some fixes --- cvat-core/src/annotations-saver.ts | 2 +- cvat-core/src/annotations.ts | 610 +- cvat-core/src/api-implementation.ts | 4 +- cvat-core/src/api.ts | 4 +- cvat-core/src/cloud-storage.ts | 2 +- cvat-core/src/exceptions.ts | 2 +- cvat-core/src/frames.ts | 2 +- cvat-core/src/interfaces.ts | 10 + cvat-core/src/issue.ts | 2 +- cvat-core/src/lambda-manager.ts | 2 +- cvat-core/src/logger-storage.ts | 2 +- cvat-core/src/organization.ts | 2 +- cvat-core/src/project-implementation.ts | 192 +- cvat-core/src/project.ts | 769 ++- cvat-core/src/server-proxy.ts | 3602 ++++++------ cvat-core/src/session.ts | 5040 ++++++++--------- cvat-ui/src/actions/export-actions.ts | 8 +- cvat-ui/src/actions/import-actions.ts | 4 +- cvat-ui/src/actions/import-backup-actions.ts | 4 +- .../create-project-content.tsx | 2 +- .../advanced-configuration-form.tsx | 4 +- .../create-task-page/create-task-content.tsx | 2 +- .../export-backup/export-backup-modal.tsx | 5 +- .../import-backup/import-backup-modal.tsx | 3 +- .../import-dataset/import-dataset-modal.tsx | 8 +- .../import-dataset-status-modal.tsx | 2 +- .../components/projects-page/actions-menu.tsx | 8 +- .../select-cloud-storage.tsx | 4 +- .../storage/source-storage-field.tsx | 2 +- .../src/components/storage/storage-field.tsx | 4 +- .../storage/storage-with-switch-field.tsx | 2 +- .../storage/target-storage-field.tsx | 2 +- cvat-ui/src/reducers/export-reducer.ts | 3 +- cvat-ui/src/reducers/import-backup-reducer.ts | 2 +- 34 files changed, 5149 insertions(+), 5167 deletions(-) create mode 100644 cvat-core/src/interfaces.ts diff --git a/cvat-core/src/annotations-saver.ts b/cvat-core/src/annotations-saver.ts index d1adbf75bf9..bfa35187a0c 100644 --- a/cvat-core/src/annotations-saver.ts +++ b/cvat-core/src/annotations-saver.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT (() => { - const serverProxy = require('./server-proxy'); + const serverProxy = require('./server-proxy').default; const { Task } = require('./session'); const { ScriptingError } = require('./exceptions'); diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index deb50107b6e..67b533868c2 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -3,410 +3,382 @@ // // SPDX-License-Identifier: MIT -(() => { - const serverProxy = require('./server-proxy'); - const Collection = require('./annotations-collection'); - const AnnotationsSaver = require('./annotations-saver'); - const AnnotationsHistory = require('./annotations-history').default; - const { checkObjectType } = require('./common'); - const { Project } = require('./project'); - const { Task, Job } = require('./session'); - const { ScriptingError, DataError, ArgumentError } = require('./exceptions'); - const { getDeletedFrames } = require('./frames'); - - const jobCache = new WeakMap(); - const taskCache = new WeakMap(); - - function getCache(sessionType) { - if (sessionType === 'task') { - return taskCache; - } +const serverProxy = require('./server-proxy').default; +const Collection = require('./annotations-collection'); +const AnnotationsSaver = require('./annotations-saver'); +const AnnotationsHistory = require('./annotations-history').default; +const { checkObjectType } = require('./common'); +const Project = require('./project').default; +const { Task, Job } = require('./session'); +const { ScriptingError, DataError, ArgumentError } = require('./exceptions'); +const { getDeletedFrames } = require('./frames'); +import { Storage } from './interfaces'; + +const jobCache = new WeakMap(); +const taskCache = new WeakMap(); + +function getCache(sessionType) { + if (sessionType === 'task') { + return taskCache; + } - if (sessionType === 'job') { - return jobCache; - } + if (sessionType === 'job') { + return jobCache; + } - throw new ScriptingError(`Unknown session type was received ${sessionType}`); - } - - async function getAnnotationsFromServer(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); - - if (!cache.has(session)) { - const rawAnnotations = await serverProxy.annotations.getAnnotations(sessionType, session.id); - - // Get meta information about frames - const startFrame = sessionType === 'job' ? session.startFrame : 0; - const stopFrame = sessionType === 'job' ? session.stopFrame : session.size - 1; - const frameMeta = {}; - for (let i = startFrame; i <= stopFrame; i++) { - frameMeta[i] = await session.frames.get(i); - } - frameMeta.deleted_frames = await getDeletedFrames(sessionType, session.id); - - const history = new AnnotationsHistory(); - const collection = new Collection({ - labels: session.labels || session.task.labels, - history, - startFrame, - stopFrame, - frameMeta, - }); - - // eslint-disable-next-line no-unsanitized/method - collection.import(rawAnnotations); - const saver = new AnnotationsSaver(rawAnnotations.version, collection, session); - cache.set(session, { collection, saver, history }); - } + throw new ScriptingError(`Unknown session type was received ${sessionType}`); +} + +async function getAnnotationsFromServer(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); + + if (!cache.has(session)) { + const rawAnnotations = await serverProxy.annotations.getAnnotations(sessionType, session.id); + + // Get meta information about frames + const startFrame = sessionType === 'job' ? session.startFrame : 0; + const stopFrame = sessionType === 'job' ? session.stopFrame : session.size - 1; + const frameMeta = {}; + for (let i = startFrame; i <= stopFrame; i++) { + frameMeta[i] = await session.frames.get(i); + } + frameMeta.deleted_frames = await getDeletedFrames(sessionType, session.id); + + const history = new AnnotationsHistory(); + const collection = new Collection({ + labels: session.labels || session.task.labels, + history, + startFrame, + stopFrame, + frameMeta, + }); + + // eslint-disable-next-line no-unsanitized/method + collection.import(rawAnnotations); + const saver = new AnnotationsSaver(rawAnnotations.version, collection, session); + cache.set(session, { collection, saver, history }); } +} - async function closeSession(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); +export async function closeSession(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - if (cache.has(session)) { - cache.delete(session); - } + if (cache.has(session)) { + cache.delete(session); } +} - async function getAnnotations(session, frame, allTracks, filters) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); +export async function getAnnotations(session, frame, allTracks, filters) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - if (cache.has(session)) { - return cache.get(session).collection.get(frame, allTracks, filters); - } - - await getAnnotationsFromServer(session); + if (cache.has(session)) { return cache.get(session).collection.get(frame, allTracks, filters); } - async function saveAnnotations(session, onUpdate) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + await getAnnotationsFromServer(session); + return cache.get(session).collection.get(frame, allTracks, filters); +} - if (cache.has(session)) { - await cache.get(session).saver.save(onUpdate); - } +export async function saveAnnotations(session, onUpdate) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - // If a collection wasn't uploaded, than it wasn't changed, finally we shouldn't save it + if (cache.has(session)) { + await cache.get(session).saver.save(onUpdate); } - function searchAnnotations(session, filters, frameFrom, frameTo) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + // If a collection wasn't uploaded, than it wasn't changed, finally we shouldn't save it +} - if (cache.has(session)) { - return cache.get(session).collection.search(filters, frameFrom, frameTo); - } +export function searchAnnotations(session, filters, frameFrom, frameTo) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.search(filters, frameFrom, frameTo); } - function searchEmptyFrame(session, frameFrom, frameTo) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.searchEmpty(frameFrom, frameTo); - } +export function searchEmptyFrame(session, frameFrom, frameTo) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.searchEmpty(frameFrom, frameTo); } - function mergeAnnotations(session, objectStates) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.merge(objectStates); - } +export function mergeAnnotations(session, objectStates) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.merge(objectStates); } - function splitAnnotations(session, objectState, frame) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.split(objectState, frame); - } +export function splitAnnotations(session, objectState, frame) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.split(objectState, frame); } - function groupAnnotations(session, objectStates, reset) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.group(objectStates, reset); - } +export function groupAnnotations(session, objectStates, reset) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.group(objectStates, reset); } - function hasUnsavedChanges(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).saver.hasUnsavedChanges(); - } +export function hasUnsavedChanges(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - return false; + if (cache.has(session)) { + return cache.get(session).saver.hasUnsavedChanges(); } - async function clearAnnotations(session, reload, startframe, endframe, delTrackKeyframesOnly) { - checkObjectType('reload', reload, 'boolean', null); - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + return false; +} - if (cache.has(session)) { - cache.get(session).collection.clear(startframe, endframe, delTrackKeyframesOnly); - } +export async function clearAnnotations(session, reload, startframe, endframe, delTrackKeyframesOnly) { + checkObjectType('reload', reload, 'boolean', null); + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - if (reload) { - cache.delete(session); - await getAnnotationsFromServer(session); - } + if (cache.has(session)) { + cache.get(session).collection.clear(startframe, endframe, delTrackKeyframesOnly); } - function annotationsStatistics(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + if (reload) { + cache.delete(session); + await getAnnotationsFromServer(session); + } +} - if (cache.has(session)) { - return cache.get(session).collection.statistics(); - } +export function annotationsStatistics(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.statistics(); } - function putAnnotations(session, objectStates) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.put(objectStates); - } +export function putAnnotations(session, objectStates) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.put(objectStates); } - function selectObject(session, objectStates, x, y) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).collection.select(objectStates, x, y); - } +export function selectObject(session, objectStates, x, y) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.select(objectStates, x, y); } - async function uploadAnnotations( - session, - format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string - ) { - const sessionType = session instanceof Task ? 'task' : 'job'; - await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} + +export async function uploadAnnotations( + session, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string +) { + const sessionType = session instanceof Task ? 'task' : 'job'; + await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file); +} + +export function importAnnotations(session, data) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); + + if (cache.has(session)) { + // eslint-disable-next-line no-unsanitized/method + return cache.get(session).collection.import(data); } - function importAnnotations(session, data) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - // eslint-disable-next-line no-unsanitized/method - return cache.get(session).collection.import(data); - } +export function exportAnnotations(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).collection.export(); } - function exportAnnotations(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); - - if (cache.has(session)) { - return cache.get(session).collection.export(); - } + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} + +export async function exportDataset( + instance, + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + name?: string, +) { + if (!(instance instanceof Task || instance instanceof Project || instance instanceof Job)) { + throw new ArgumentError('A dataset can only be created from a job, task or project'); + } - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); - } - - async function exportDataset( - instance, - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - name?: string, - ) { - if (!(instance instanceof Task || instance instanceof Project || instance instanceof Job)) { - throw new ArgumentError('A dataset can only be created from a job, task or project'); - } + let result = null; + if (instance instanceof Task) { + result = await serverProxy.tasks.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); + } else if (instance instanceof Job) { + result = await serverProxy.jobs.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); + } else { + result = await serverProxy.projects.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); + } - let result = null; - if (instance instanceof Task) { - result = await serverProxy.tasks.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); - } else if (instance instanceof Job) { - result = await serverProxy.jobs.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); - } else { - result = await serverProxy.projects.exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name); - } + return result; +} - return result; +export function importDataset(instance, format: string, useDefaultSettings: boolean, sourceStorage: Storage, + file: File | string, updateStatusCallback = () => {}) { + if (!(typeof format === 'string')) { + throw new ArgumentError('Format must be a string'); } - - function importDataset(instance, format: string, useDefaultSettings: boolean, sourceStorage: Storage, - file: File | string, updateStatusCallback = () => {}) { - if (!(typeof format === 'string')) { - throw new ArgumentError('Format must be a string'); - } - if (!(instance instanceof Project)) { - throw new ArgumentError('Instance should be a Project instance'); - } - if (!(typeof updateStatusCallback === 'function')) { - throw new ArgumentError('Callback should be a function'); - } - if (typeof file === 'string' && !file.endsWith('.zip')) { - throw new ArgumentError('File should be file instance with ZIP extension'); - } - if (file instanceof File && !(['application/zip', 'application/x-zip-compressed'].includes(file.type))) { - throw new ArgumentError('File should be file instance with ZIP extension'); - } - return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); + if (!(instance instanceof Project)) { + throw new ArgumentError('Instance should be a Project instance'); } + if (!(typeof updateStatusCallback === 'function')) { + throw new ArgumentError('Callback should be a function'); + } + if (typeof file === 'string' && !file.endsWith('.zip')) { + throw new ArgumentError('File should be file instance with ZIP extension'); + } + if (file instanceof File && !(['application/zip', 'application/x-zip-compressed'].includes(file.type))) { + throw new ArgumentError('File should be file instance with ZIP extension'); + } + return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); +} - function getHistory(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); - - if (cache.has(session)) { - return cache.get(session).history; - } +export function getHistory(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).history; } - async function undoActions(session, count) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).history.undo(count); - } +export async function undoActions(session, count) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).history.undo(count); } - async function redoActions(session, count) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).history.redo(count); - } +export async function redoActions(session, count) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).history.redo(count); } - function freezeHistory(session, frozen) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).history.freeze(frozen); - } +export function freezeHistory(session, frozen) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).history.freeze(frozen); } - function clearActions(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).history.clear(); - } +export function clearActions(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); + if (cache.has(session)) { + return cache.get(session).history.clear(); } - function getActions(session) { - const sessionType = session instanceof Task ? 'task' : 'job'; - const cache = getCache(sessionType); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} - if (cache.has(session)) { - return cache.get(session).history.get(); - } +export function getActions(session) { + const sessionType = session instanceof Task ? 'task' : 'job'; + const cache = getCache(sessionType); + + if (cache.has(session)) { + return cache.get(session).history.get(); + } - throw new DataError( - 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', - ); - } - - module.exports = { - getAnnotations, - putAnnotations, - saveAnnotations, - hasUnsavedChanges, - mergeAnnotations, - searchAnnotations, - searchEmptyFrame, - splitAnnotations, - groupAnnotations, - clearAnnotations, - annotationsStatistics, - selectObject, - uploadAnnotations, - importAnnotations, - exportAnnotations, - exportDataset, - importDataset, - undoActions, - redoActions, - freezeHistory, - getHistory, - clearActions, - getActions, - closeSession, - }; -})(); + throw new DataError( + 'Collection has not been initialized yet. Call annotations.get() or annotations.clear(true) before', + ); +} diff --git a/cvat-core/src/api-implementation.ts b/cvat-core/src/api-implementation.ts index ed5c6490259..a45ed1a9c13 100644 --- a/cvat-core/src/api-implementation.ts +++ b/cvat-core/src/api-implementation.ts @@ -6,7 +6,7 @@ const config = require('./config'); (() => { const PluginRegistry = require('./plugins').default; - const serverProxy = require('./server-proxy'); + const serverProxy = require('./server-proxy').default; const lambdaManager = require('./lambda-manager'); const { isBoolean, @@ -21,7 +21,7 @@ const config = require('./config'); const { AnnotationFormats } = require('./annotation-formats'); const { ArgumentError } = require('./exceptions'); const { Task, Job } = require('./session'); - const { Project } = require('./project'); + const Project = require('./project').default; const { CloudStorage } = require('./cloud-storage'); const Organization = require('./organization'); diff --git a/cvat-core/src/api.ts b/cvat-core/src/api.ts index 77f1eb00a28..59bb6204677 100644 --- a/cvat-core/src/api.ts +++ b/cvat-core/src/api.ts @@ -16,8 +16,8 @@ function build() { const Comment = require('./comment'); const Issue = require('./issue'); const { Job, Task } = require('./session'); - const { Project } = require('./project'); - const implementProject = require('./project-implementation'); + const Project = require('./project').default; + const implementProject = require('./project-implementation').default; const { Attribute, Label } = require('./labels'); const MLModel = require('./ml-model'); const { FrameData } = require('./frames'); diff --git a/cvat-core/src/cloud-storage.ts b/cvat-core/src/cloud-storage.ts index ab2c70d8da1..94f8c02e962 100644 --- a/cvat-core/src/cloud-storage.ts +++ b/cvat-core/src/cloud-storage.ts @@ -4,7 +4,7 @@ (() => { const PluginRegistry = require('./plugins').default; - const serverProxy = require('./server-proxy'); + const serverProxy = require('./server-proxy').default; const { isBrowser, isNode } = require('browser-or-node'); const { ArgumentError } = require('./exceptions'); const { CloudStorageCredentialsType, CloudStorageProviderType } = require('./enums'); diff --git a/cvat-core/src/exceptions.ts b/cvat-core/src/exceptions.ts index db30611580c..88eaee74e91 100644 --- a/cvat-core/src/exceptions.ts +++ b/cvat-core/src/exceptions.ts @@ -171,7 +171,7 @@ export class Exception extends Error { }; try { - const serverProxy = require('./server-proxy'); + const serverProxy = require('./server-proxy').default; await serverProxy.server.exception(exceptionObject); } catch (exception) { // add event diff --git a/cvat-core/src/frames.ts b/cvat-core/src/frames.ts index 4dfd9ae0258..048c1fe29ba 100644 --- a/cvat-core/src/frames.ts +++ b/cvat-core/src/frames.ts @@ -5,7 +5,7 @@ (() => { const cvatData = require('cvat-data'); const PluginRegistry = require('./plugins').default; - const serverProxy = require('./server-proxy'); + const serverProxy = require('./server-proxy').default; const { isBrowser, isNode } = require('browser-or-node'); const { Exception, ArgumentError, DataError } = require('./exceptions'); diff --git a/cvat-core/src/interfaces.ts b/cvat-core/src/interfaces.ts new file mode 100644 index 00000000000..c1fa5f0eeff --- /dev/null +++ b/cvat-core/src/interfaces.ts @@ -0,0 +1,10 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +import { StorageLocation } from './enums'; + +export interface Storage { + location: StorageLocation; + cloudStorageId?: number; +} diff --git a/cvat-core/src/issue.ts b/cvat-core/src/issue.ts index 795d5b7a6b3..9d6b5c2b6df 100644 --- a/cvat-core/src/issue.ts +++ b/cvat-core/src/issue.ts @@ -8,7 +8,7 @@ const PluginRegistry = require('./plugins').default; const Comment = require('./comment'); const User = require('./user'); const { ArgumentError } = require('./exceptions'); -const serverProxy = require('./server-proxy'); +const serverProxy = require('./server-proxy').default; /** * Class representing a single issue diff --git a/cvat-core/src/lambda-manager.ts b/cvat-core/src/lambda-manager.ts index b7562dabcad..51a8571078c 100644 --- a/cvat-core/src/lambda-manager.ts +++ b/cvat-core/src/lambda-manager.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -const serverProxy = require('./server-proxy'); +const serverProxy = require('./server-proxy').default; const { ArgumentError } = require('./exceptions'); const MLModel = require('./ml-model'); const { RQStatus } = require('./enums'); diff --git a/cvat-core/src/logger-storage.ts b/cvat-core/src/logger-storage.ts index 530219f93d4..82229372320 100644 --- a/cvat-core/src/logger-storage.ts +++ b/cvat-core/src/logger-storage.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT const PluginRegistry = require('./plugins').default; -const serverProxy = require('./server-proxy'); +const serverProxy = require('./server-proxy').default; const logFactory = require('./log'); const { ArgumentError } = require('./exceptions'); const { LogType } = require('./enums'); diff --git a/cvat-core/src/organization.ts b/cvat-core/src/organization.ts index 4fcf129beff..4a304ca550e 100644 --- a/cvat-core/src/organization.ts +++ b/cvat-core/src/organization.ts @@ -7,7 +7,7 @@ const config = require('./config'); const { MembershipRole } = require('./enums'); const { ArgumentError, ServerError } = require('./exceptions'); const PluginRegistry = require('./plugins').default; -const serverProxy = require('./server-proxy'); +const serverProxy = require('./server-proxy').default; const User = require('./user'); /** diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index d8328df65e6..1d780b7b0de 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -3,104 +3,106 @@ // // SPDX-License-Identifier: MIT -(() => { - const serverProxy = require('./server-proxy'); - const { getPreview } = require('./frames'); - - const { Project } = require('./project'); - const { exportDataset, importDataset } = require('./annotations'); - - function implementProject(projectClass) { - projectClass.prototype.save.implementation = async function () { - if (typeof this.id !== 'undefined') { - const projectData = this._updateTrigger.getUpdated(this, { - bugTracker: 'bug_tracker', - trainingProject: 'training_project', - assignee: 'assignee_id', - }); - if (projectData.assignee_id) { - projectData.assignee_id = projectData.assignee_id.id; - } - if (projectData.labels) { - projectData.labels = projectData.labels.map((el) => el.toJSON()); - } - - await serverProxy.projects.save(this.id, projectData); - this._updateTrigger.reset(); - return this; +import { Storage } from './interfaces'; + +const serverProxy = require('./server-proxy').default; +const { getPreview } = require('./frames'); + +const Project = require('./project').default; +const { exportDataset, importDataset } = require('./annotations'); + +export default function implementProject(projectClass) { + projectClass.prototype.save.implementation = async function () { + if (typeof this.id !== 'undefined') { + const projectData = this._updateTrigger.getUpdated(this, { + bugTracker: 'bug_tracker', + trainingProject: 'training_project', + assignee: 'assignee_id', + }); + if (projectData.assignee_id) { + projectData.assignee_id = projectData.assignee_id.id; } - - // initial creating - const projectSpec: any = { - name: this.name, - labels: this.labels.map((el) => el.toJSON()), - }; - - if (this.bugTracker) { - projectSpec.bug_tracker = this.bugTracker; - } - - if (this.trainingProject) { - projectSpec.training_project = this.trainingProject; - } - - if (this.targetStorage) { - projectSpec.target_storage = this.targetStorage; - } - - if (this.sourceStorage) { - projectSpec.source_storage = this.sourceStorage; - } - - const project = await serverProxy.projects.create(projectSpec); - return new Project(project); - }; - - projectClass.prototype.delete.implementation = async function () { - const result = await serverProxy.projects.delete(this.id); - return result; - }; - - projectClass.prototype.preview.implementation = async function () { - if (!this._internalData.task_ids.length) { - return ''; + if (projectData.labels) { + projectData.labels = projectData.labels.map((el) => el.toJSON()); } - const frameData = await getPreview(this._internalData.task_ids[0]); - return frameData; - }; - projectClass.prototype.annotations.exportDataset.implementation = async function ( - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - customName?: string - ) { - const result = exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); - return result; - }; - projectClass.prototype.annotations.importDataset.implementation = async function ( - format: string, - useDefaultSettings: boolean, - sourceStorage: Storage, - file: File | string, - updateStatusCallback - ) { - return importDataset(this, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); - }; + await serverProxy.projects.save(this.id, projectData); + this._updateTrigger.reset(); + return this; + } - projectClass.prototype.export.implementation = async function (targetStorage: Storage, fileName?: string) { - const result = await serverProxy.projects.export(this.id, targetStorage, fileName); - return result; + // initial creating + const projectSpec: any = { + name: this.name, + labels: this.labels.map((el) => el.toJSON()), }; - projectClass.import.implementation = async function (storage: Storage, file: File | string) { - const result = await serverProxy.projects.import(storage, file); - return result; - }; - - return projectClass; - } - - module.exports = implementProject; -})(); + if (this.bugTracker) { + projectSpec.bug_tracker = this.bugTracker; + } + + if (this.trainingProject) { + projectSpec.training_project = this.trainingProject; + } + + if (this.targetStorage) { + projectSpec.target_storage = this.targetStorage; + } + + if (this.sourceStorage) { + projectSpec.source_storage = this.sourceStorage; + } + + const project = await serverProxy.projects.create(projectSpec); + return new Project(project); + }; + + projectClass.prototype.delete.implementation = async function () { + const result = await serverProxy.projects.delete(this.id); + return result; + }; + + projectClass.prototype.preview.implementation = async function () { + if (!this._internalData.task_ids.length) { + return ''; + } + const frameData = await getPreview(this._internalData.task_ids[0]); + return frameData; + }; + + projectClass.prototype.annotations.exportDataset.implementation = async function ( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { + const result = exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); + return result; + }; + projectClass.prototype.annotations.importDataset.implementation = async function ( + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string, + updateStatusCallback + ) { + return importDataset(this, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); + }; + + projectClass.prototype.export.implementation = async function ( + targetStorage: Storage, + useDefaultSettings: boolean, + fileName?: string + ) { + const result = await serverProxy.projects.export(this.id, targetStorage, useDefaultSettings, fileName); + return result; + }; + + projectClass.import.implementation = async function (storage: Storage, file: File | string) { + const result = await serverProxy.projects.import(storage, file); + return result; + }; + + return projectClass; +} diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index 00f559e19db..7d2a68653b6 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -3,419 +3,416 @@ // // SPDX-License-Identifier: MIT -(() => { - const PluginRegistry = require('./plugins').default; - const { ArgumentError } = require('./exceptions'); - const { Label } = require('./labels'); - const User = require('./user'); - const { FieldUpdateTrigger } = require('./common'); +import { Storage } from './interfaces'; +const PluginRegistry = require('./plugins').default; +const { ArgumentError } = require('./exceptions'); +const { Label } = require('./labels'); +const User = require('./user'); +const { FieldUpdateTrigger } = require('./common'); + +/** + * Class representing a project + * @memberof module:API.cvat.classes + */ +export default class Project { /** - * Class representing a project - * @memberof module:API.cvat.classes + * In a fact you need use the constructor only if you want to create a project + * @param {object} initialData - Object which is used for initialization + *
It can contain keys: + *
  • name + *
  • labels */ - class Project { - /** - * In a fact you need use the constructor only if you want to create a project - * @param {object} initialData - Object which is used for initialization - *
    It can contain keys: - *
  • name - *
  • labels - */ - constructor(initialData) { - const data = { - id: undefined, - name: undefined, - status: undefined, - assignee: undefined, - owner: undefined, - bug_tracker: undefined, - created_date: undefined, - updated_date: undefined, - task_subsets: undefined, - training_project: undefined, - task_ids: undefined, - dimension: undefined, - source_storage: undefined, - target_storage: undefined, - labels: undefined, - }; + constructor(initialData) { + const data = { + id: undefined, + name: undefined, + status: undefined, + assignee: undefined, + owner: undefined, + bug_tracker: undefined, + created_date: undefined, + updated_date: undefined, + task_subsets: undefined, + training_project: undefined, + task_ids: undefined, + dimension: undefined, + source_storage: undefined, + target_storage: undefined, + labels: undefined, + }; - const updateTrigger = new FieldUpdateTrigger(); + const updateTrigger = new FieldUpdateTrigger(); - for (const property in data) { - if (Object.prototype.hasOwnProperty.call(data, property) && property in initialData) { - data[property] = initialData[property]; - } + for (const property in data) { + if (Object.prototype.hasOwnProperty.call(data, property) && property in initialData) { + data[property] = initialData[property]; } + } - data.labels = []; + data.labels = []; - if (Array.isArray(initialData.labels)) { - data.labels = initialData.labels - .map((labelData) => new Label(labelData)).filter((label) => !label.hasParent); - } + if (Array.isArray(initialData.labels)) { + data.labels = initialData.labels + .map((labelData) => new Label(labelData)).filter((label) => !label.hasParent); + } - if (typeof initialData.training_project === 'object') { - data.training_project = { ...initialData.training_project }; - } + if (typeof initialData.training_project === 'object') { + data.training_project = { ...initialData.training_project }; + } - Object.defineProperties( - this, - Object.freeze({ - /** - * @name id - * @type {number} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - id: { - get: () => data.id, - }, - /** - * @name name - * @type {string} - * @memberof module:API.cvat.classes.Project - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - name: { - get: () => data.name, - set: (value) => { - if (!value.trim().length) { - throw new ArgumentError('Value must not be empty'); - } - data.name = value; - updateTrigger.update('name'); - }, + Object.defineProperties( + this, + Object.freeze({ + /** + * @name id + * @type {number} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + id: { + get: () => data.id, + }, + /** + * @name name + * @type {string} + * @memberof module:API.cvat.classes.Project + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + name: { + get: () => data.name, + set: (value) => { + if (!value.trim().length) { + throw new ArgumentError('Value must not be empty'); + } + data.name = value; + updateTrigger.update('name'); }, + }, - /** - * @name status - * @type {module:API.cvat.enums.TaskStatus} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - status: { - get: () => data.status, - }, - /** - * Instance of a user who was assigned for the project - * @name assignee - * @type {module:API.cvat.classes.User} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - assignee: { - get: () => data.assignee, - set: (assignee) => { - if (assignee !== null && !(assignee instanceof User)) { - throw new ArgumentError('Value must be a user instance'); - } - data.assignee = assignee; - updateTrigger.update('assignee'); - }, - }, - /** - * Instance of a user who has created the project - * @name owner - * @type {module:API.cvat.classes.User} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - owner: { - get: () => data.owner, - }, - /** - * @name bugTracker - * @type {string} - * @memberof module:API.cvat.classes.Project - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - bugTracker: { - get: () => data.bug_tracker, - set: (tracker) => { - data.bug_tracker = tracker; - updateTrigger.update('bugTracker'); - }, - }, - /** - * @name createdDate - * @type {string} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - createdDate: { - get: () => data.created_date, - }, - /** - * @name updatedDate - * @type {string} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - updatedDate: { - get: () => data.updated_date, + /** + * @name status + * @type {module:API.cvat.enums.TaskStatus} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + status: { + get: () => data.status, + }, + /** + * Instance of a user who was assigned for the project + * @name assignee + * @type {module:API.cvat.classes.User} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + assignee: { + get: () => data.assignee, + set: (assignee) => { + if (assignee !== null && !(assignee instanceof User)) { + throw new ArgumentError('Value must be a user instance'); + } + data.assignee = assignee; + updateTrigger.update('assignee'); }, - /** - * Dimesion of the tasks in the project, if no task dimension is null - * @name dimension - * @type {string} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - dimension: { - get: () => data.dimension, + }, + /** + * Instance of a user who has created the project + * @name owner + * @type {module:API.cvat.classes.User} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + owner: { + get: () => data.owner, + }, + /** + * @name bugTracker + * @type {string} + * @memberof module:API.cvat.classes.Project + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + bugTracker: { + get: () => data.bug_tracker, + set: (tracker) => { + data.bug_tracker = tracker; + updateTrigger.update('bugTracker'); }, - /** - * After project has been created value can be appended only. - * @name labels - * @type {module:API.cvat.classes.Label[]} - * @memberof module:API.cvat.classes.Project - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - labels: { - get: () => [...data.labels], - set: (labels) => { - if (!Array.isArray(labels)) { - throw new ArgumentError('Value must be an array of Labels'); - } + }, + /** + * @name createdDate + * @type {string} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + createdDate: { + get: () => data.created_date, + }, + /** + * @name updatedDate + * @type {string} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + updatedDate: { + get: () => data.updated_date, + }, + /** + * Dimesion of the tasks in the project, if no task dimension is null + * @name dimension + * @type {string} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + dimension: { + get: () => data.dimension, + }, + /** + * After project has been created value can be appended only. + * @name labels + * @type {module:API.cvat.classes.Label[]} + * @memberof module:API.cvat.classes.Project + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + labels: { + get: () => [...data.labels], + set: (labels) => { + if (!Array.isArray(labels)) { + throw new ArgumentError('Value must be an array of Labels'); + } - if (!Array.isArray(labels) || labels.some((label) => !(label instanceof Label))) { - throw new ArgumentError( - `Each array value must be an instance of Label. ${typeof label} was found`, - ); - } + if (!Array.isArray(labels) || labels.some((label) => !(label instanceof Label))) { + throw new ArgumentError( + `Each array value must be an instance of Label. ${typeof label} was found`, + ); + } - const IDs = labels.map((_label) => _label.id); - const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id)); - deletedLabels.forEach((_label) => { - _label.deleted = true; - }); + const IDs = labels.map((_label) => _label.id); + const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id)); + deletedLabels.forEach((_label) => { + _label.deleted = true; + }); - data.labels = [...deletedLabels, ...labels]; - updateTrigger.update('labels'); - }, - }, - /** - * Subsets array for related tasks - * @name subsets - * @type {string[]} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - subsets: { - get: () => [...data.task_subsets], - }, - /** - * Training project associated with this annotation project - * This is a simple object which contains - * keys like host, username, password, enabled, project_class - * @name trainingProject - * @type {object} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - trainingProject: { - get: () => { - if (typeof data.training_project === 'object') { - return { ...data.training_project }; - } - return data.training_project; - }, - set: (updatedProject) => { - if (typeof training === 'object') { - data.training_project = { ...updatedProject }; - } else { - data.training_project = updatedProject; - } - updateTrigger.update('trainingProject'); - }, + data.labels = [...deletedLabels, ...labels]; + updateTrigger.update('labels'); }, - /** - * Source storage for import resources. - * @name sourceStorage - * @type {module:API.cvat.classes.Storage} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - sourceStorage: { - get: () => data.source_storage, - }, - /** - * Target storage for export resources. - * @name targetStorage - * @type {module:API.cvat.classes.Storage} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - */ - targetStorage: { - get: () => data.target_storage, - }, - _internalData: { - get: () => data, + }, + /** + * Subsets array for related tasks + * @name subsets + * @type {string[]} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + subsets: { + get: () => [...data.task_subsets], + }, + /** + * Training project associated with this annotation project + * This is a simple object which contains + * keys like host, username, password, enabled, project_class + * @name trainingProject + * @type {object} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + trainingProject: { + get: () => { + if (typeof data.training_project === 'object') { + return { ...data.training_project }; + } + return data.training_project; }, - _updateTrigger: { - get: () => updateTrigger, + set: (updatedProject) => { + if (typeof training === 'object') { + data.training_project = { ...updatedProject }; + } else { + data.training_project = updatedProject; + } + updateTrigger.update('trainingProject'); }, - }), - ); + }, + /** + * Source storage for import resources. + * @name sourceStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + sourceStorage: { + get: () => data.source_storage, + }, + /** + * Target storage for export resources. + * @name targetStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + */ + targetStorage: { + get: () => data.target_storage, + }, + _internalData: { + get: () => data, + }, + _updateTrigger: { + get: () => updateTrigger, + }, + }), + ); - // When we call a function, for example: project.annotations.get() - // In the method get we lose the project context - // So, we need return it - this.annotations = { - exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), - importDataset: Object.getPrototypeOf(this).annotations.importDataset.bind(this), - }; - } + // When we call a function, for example: project.annotations.get() + // In the method get we lose the project context + // So, we need return it + this.annotations = { + exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), + importDataset: Object.getPrototypeOf(this).annotations.importDataset.bind(this), + }; + } - /** - * Get the first frame of the first task of a project for preview - * @method preview - * @memberof Project - * @returns {string} - jpeg encoded image - * @instance - * @async - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - async preview() { - const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.preview); - return result; - } + /** + * Get the first frame of the first task of a project for preview + * @method preview + * @memberof Project + * @returns {string} - jpeg encoded image + * @instance + * @async + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + async preview() { + const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.preview); + return result; + } - /** - * Method updates data of a created project or creates new project from scratch - * @method save - * @returns {module:API.cvat.classes.Project} - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} - */ - async save() { - const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.save); - return result; - } + /** + * Method updates data of a created project or creates new project from scratch + * @method save + * @returns {module:API.cvat.classes.Project} + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async save() { + const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.save); + return result; + } - /** - * Method deletes a project from a server - * @method delete - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} - */ - async delete() { - const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.delete); - return result; - } + /** + * Method deletes a project from a server + * @method delete + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async delete() { + const result = await PluginRegistry.apiWrapper.call(this, Project.prototype.delete); + return result; + } - /** - * Method makes a backup of a project - * @method export - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} - * @returns {string} URL to get result archive - */ - async export(targetStorage: Storage, fileName?: string) { - const result = await PluginRegistry.apiWrapper.call( - this, - Project.prototype.export, - targetStorage, - fileName - ); - return result; - } + /** + * Method makes a backup of a project + * @method export + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + * @returns {string} URL to get result archive + */ + async export(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + const result = await PluginRegistry.apiWrapper.call( + this, + Project.prototype.export, + targetStorage, + useDefaultSettings, + fileName + ); + return result; + } - /** - * Method restores a project from a backup - * @method import - * @memberof module:API.cvat.classes.Project - * @readonly - * @instance - * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} - * @returns {number} ID of the imported project - */ - static async import(storage: Storage, file: File | string) { - const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file); - return result; - } + /** + * Method restores a project from a backup + * @method import + * @memberof module:API.cvat.classes.Project + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + * @returns {number} ID of the imported project + */ + static async import(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file); + return result; } +} - Object.defineProperties( - Project.prototype, - Object.freeze({ - annotations: Object.freeze({ - value: { - async exportDataset( - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - customName?: string - ) { - const result = await PluginRegistry.apiWrapper.call( - this, - Project.prototype.annotations.exportDataset, - format, - saveImages, - useDefaultSettings, - targetStorage, - customName - ); - return result; - }, - async importDataset( - format: string, - useDefaultSettings: boolean, - sourceStorage: Storage, - file: File | string, - updateStatusCallback = null - ) { - const result = await PluginRegistry.apiWrapper.call( - this, - Project.prototype.annotations.importDataset, - format, - useDefaultSettings, - sourceStorage, - file, - updateStatusCallback - ); - return result; - }, +Object.defineProperties( + Project.prototype, + Object.freeze({ + annotations: Object.freeze({ + value: { + async exportDataset( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { + const result = await PluginRegistry.apiWrapper.call( + this, + Project.prototype.annotations.exportDataset, + format, + saveImages, + useDefaultSettings, + targetStorage, + customName + ); + return result; }, - writable: true, - }), + async importDataset( + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string, + updateStatusCallback = null + ) { + const result = await PluginRegistry.apiWrapper.call( + this, + Project.prototype.annotations.importDataset, + format, + useDefaultSettings, + sourceStorage, + file, + updateStatusCallback + ); + return result; + }, + }, + writable: true, }), - ); - - module.exports = { - Project, - }; -})(); + }), +); diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index 0fa429616d0..bf0e5ae9dc8 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -3,7 +3,8 @@ // // SPDX-License-Identifier: MIT -import { Storage, StorageLocation } from "enums"; +import { StorageLocation } from './enums'; +import { Storage } from './interfaces'; type Params = { org: number | string, @@ -15,2181 +16,2184 @@ type Params = { action?: string, } -(() => { - const FormData = require('form-data'); - const { ServerError } = require('./exceptions'); - const store = require('store'); - const config = require('./config'); - const DownloadWorker = require('./download.worker'); - const Axios = require('axios'); - const tus = require('tus-js-client'); - - function enableOrganization() { - return { org: config.organizationID || '' }; - } +const FormData = require('form-data'); +const { ServerError } = require('./exceptions'); +const store = require('store'); +const config = require('./config'); +const DownloadWorker = require('./download.worker'); +const Axios = require('axios'); +const tus = require('tus-js-client'); + +function enableOrganization() { + return { org: config.organizationID || '' }; +} - function configureStorage(storage: Storage = { location: StorageLocation.LOCAL }, useDefaultLocation: boolean = false) { - return { - use_default_location: useDefaultLocation, - ...(!useDefaultLocation ? { - location: storage.location, - ...(storage.cloudStorageId ? { - cloud_storage_id: storage.cloudStorageId, - } : {}) +function configureStorage(storage: Storage = { location: StorageLocation.LOCAL }, useDefaultLocation: boolean = false) { + return { + use_default_location: useDefaultLocation, + ...(!useDefaultLocation ? { + location: storage.location, + ...(storage.cloudStorageId ? { + cloud_storage_id: storage.cloudStorageId, } : {}) - }; - } + } : {}) + }; +} - function removeToken() { - Axios.defaults.headers.common.Authorization = ''; - store.remove('token'); - } +function removeToken() { + Axios.defaults.headers.common.Authorization = ''; + store.remove('token'); +} - function waitFor(frequencyHz, predicate) { - return new Promise((resolve, reject) => { - if (typeof predicate !== 'function') { - reject(new Error(`Predicate must be a function, got ${typeof predicate}`)); +function waitFor(frequencyHz, predicate) { + return new Promise((resolve, reject) => { + if (typeof predicate !== 'function') { + reject(new Error(`Predicate must be a function, got ${typeof predicate}`)); + } + + const internalWait = () => { + let result = false; + try { + result = predicate(); + } catch (error) { + reject(error); } - const internalWait = () => { - let result = false; - try { - result = predicate(); - } catch (error) { - reject(error); - } + if (result) { + resolve(); + } else { + setTimeout(internalWait, 1000 / frequencyHz); + } + }; - if (result) { - resolve(); - } else { - setTimeout(internalWait, 1000 / frequencyHz); - } - }; + setTimeout(internalWait); + }); +} - setTimeout(internalWait); +async function chunkUpload(file, uploadConfig) { + const params = enableOrganization(); + const { + endpoint, chunkSize, totalSize, onUpdate, metadata, + } = uploadConfig; + const { totalSentSize } = uploadConfig; + const uploadResult = { totalSentSize }; + return new Promise((resolve, reject) => { + const upload = new tus.Upload(file, { + endpoint, + metadata: { + filename: file.name, + filetype: file.type, + ...metadata, + }, + headers: { + Authorization: Axios.defaults.headers.common.Authorization, + }, + chunkSize, + retryDelays: null, + onError(error) { + reject(error); + }, + onBeforeRequest(req) { + const xhr = req.getUnderlyingObject(); + const { org } = params; + req.setHeader('X-Organization', org); + xhr.withCredentials = true; + }, + onProgress(bytesUploaded) { + if (onUpdate && Number.isInteger(totalSentSize) && Number.isInteger(totalSize)) { + const currentUploadedSize = totalSentSize + bytesUploaded; + const percentage = currentUploadedSize / totalSize; + onUpdate(percentage); + } + }, + onAfterResponse(request, response) { + const uploadFilename = response.getHeader('Upload-Filename'); + if (uploadFilename) uploadResult.filename = uploadFilename; + }, + onSuccess() { + if (totalSentSize) uploadResult.totalSentSize += file.size; + resolve(uploadResult); + }, }); - } + upload.start(); + }); +} - async function chunkUpload(file, uploadConfig) { - const params = enableOrganization(); - const { - endpoint, chunkSize, totalSize, onUpdate, metadata, - } = uploadConfig; - const { totalSentSize } = uploadConfig; - const uploadResult = { totalSentSize }; - return new Promise((resolve, reject) => { - const upload = new tus.Upload(file, { - endpoint, - metadata: { - filename: file.name, - filetype: file.type, - ...metadata, - }, - headers: { - Authorization: Axios.defaults.headers.common.Authorization, - }, - chunkSize, - retryDelays: null, - onError(error) { - reject(error); - }, - onBeforeRequest(req) { - const xhr = req.getUnderlyingObject(); - const { org } = params; - req.setHeader('X-Organization', org); - xhr.withCredentials = true; - }, - onProgress(bytesUploaded) { - if (onUpdate && Number.isInteger(totalSentSize) && Number.isInteger(totalSize)) { - const currentUploadedSize = totalSentSize + bytesUploaded; - const percentage = currentUploadedSize / totalSize; - onUpdate(percentage); - } - }, - onAfterResponse(request, response) { - const uploadFilename = response.getHeader('Upload-Filename'); - if (uploadFilename) uploadResult.filename = uploadFilename; - }, - onSuccess() { - if (totalSentSize) uploadResult.totalSentSize += file.size; - resolve(uploadResult); - }, - }); - upload.start(); - }); +function generateError(errorData) { + if (errorData.response) { + const message = `${errorData.message}. ${JSON.stringify(errorData.response.data) || ''}.`; + return new ServerError(message, errorData.response.status); } - function generateError(errorData) { - if (errorData.response) { - const message = `${errorData.message}. ${JSON.stringify(errorData.response.data) || ''}.`; - return new ServerError(message, errorData.response.status); - } - - // Server is unavailable (no any response) - const message = `${errorData.message}.`; // usually is "Error Network" - return new ServerError(message, 0); - } + // Server is unavailable (no any response) + const message = `${errorData.message}.`; // usually is "Error Network" + return new ServerError(message, 0); +} - function prepareData(details) { - const data = new FormData(); - for (const [key, value] of Object.entries(details)) { - if (Array.isArray(value)) { - value.forEach((element, idx) => { - data.append(`${key}[${idx}]`, element); - }); - } else { - data.set(key, value); - } +function prepareData(details) { + const data = new FormData(); + for (const [key, value] of Object.entries(details)) { + if (Array.isArray(value)) { + value.forEach((element, idx) => { + data.append(`${key}[${idx}]`, element); + }); + } else { + data.set(key, value); } - return data; } + return data; +} - class WorkerWrappedAxios { - constructor(requestInterseptor) { - const worker = new DownloadWorker(requestInterseptor); - const requests = {}; - let requestId = 0; - - worker.onmessage = (e) => { - if (e.data.id in requests) { - if (e.data.isSuccess) { - requests[e.data.id].resolve(e.data.responseData); - } else { - requests[e.data.id].reject({ - response: { - status: e.data.status, - data: e.data.responseData, - }, - }); - } - - delete requests[e.data.id]; - } - }; +class WorkerWrappedAxios { + constructor(requestInterseptor) { + const worker = new DownloadWorker(requestInterseptor); + const requests = {}; + let requestId = 0; - worker.onerror = (e) => { - if (e.data.id in requests) { - requests[e.data.id].reject(e); - delete requests[e.data.id]; + worker.onmessage = (e) => { + if (e.data.id in requests) { + if (e.data.isSuccess) { + requests[e.data.id].resolve(e.data.responseData); + } else { + requests[e.data.id].reject({ + response: { + status: e.data.status, + data: e.data.responseData, + }, + }); } - }; - function getRequestId() { - return requestId++; + delete requests[e.data.id]; } + }; - async function get(url, requestConfig) { - return new Promise((resolve, reject) => { - const newRequestId = getRequestId(); - requests[newRequestId] = { - resolve, - reject, - }; - worker.postMessage({ - url, - config: requestConfig, - id: newRequestId, - }); - }); + worker.onerror = (e) => { + if (e.data.id in requests) { + requests[e.data.id].reject(e); + delete requests[e.data.id]; } + }; - Object.defineProperties( - this, - Object.freeze({ - get: { - value: get, - writable: false, - }, - }), - ); + function getRequestId() { + return requestId++; } - } - - class ServerProxy { - constructor() { - Axios.defaults.withCredentials = true; - Axios.defaults.xsrfHeaderName = 'X-CSRFTOKEN'; - Axios.defaults.xsrfCookieName = 'csrftoken'; - const workerAxios = new WorkerWrappedAxios(); - Axios.interceptors.request.use((reqConfig) => { - if ('params' in reqConfig && 'org' in reqConfig.params) { - return reqConfig; - } - reqConfig.params = { ...enableOrganization(), ...(reqConfig.params || {}) }; - return reqConfig; + async function get(url, requestConfig) { + return new Promise((resolve, reject) => { + const newRequestId = getRequestId(); + requests[newRequestId] = { + resolve, + reject, + }; + worker.postMessage({ + url, + config: requestConfig, + id: newRequestId, + }); }); + } + + Object.defineProperties( + this, + Object.freeze({ + get: { + value: get, + writable: false, + }, + }), + ); + } +} - let token = store.get('token'); - if (token) { - Axios.defaults.headers.common.Authorization = `Token ${token}`; +class ServerProxy { + constructor() { + Axios.defaults.withCredentials = true; + Axios.defaults.xsrfHeaderName = 'X-CSRFTOKEN'; + Axios.defaults.xsrfCookieName = 'csrftoken'; + const workerAxios = new WorkerWrappedAxios(); + Axios.interceptors.request.use((reqConfig) => { + if ('params' in reqConfig && 'org' in reqConfig.params) { + return reqConfig; } - async function about() { - const { backendAPI } = config; + reqConfig.params = { ...enableOrganization(), ...(reqConfig.params || {}) }; + return reqConfig; + }); - let response = null; - try { - response = await Axios.get(`${backendAPI}/server/about`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + let token = store.get('token'); + if (token) { + Axios.defaults.headers.common.Authorization = `Token ${token}`; + } - return response.data; + async function about() { + const { backendAPI } = config; + + let response = null; + try { + response = await Axios.get(`${backendAPI}/server/about`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function share(directoryArg) { - const { backendAPI } = config; - const directory = encodeURI(directoryArg); + return response.data; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/server/share`, { - proxy: config.proxy, - params: { directory }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function share(directoryArg) { + const { backendAPI } = config; + const directory = encodeURI(directoryArg); - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/server/share`, { + proxy: config.proxy, + params: { directory }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function exception(exceptionObject) { - const { backendAPI } = config; + return response.data; + } - try { - await Axios.post(`${backendAPI}/server/exception`, JSON.stringify(exceptionObject), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } - } + async function exception(exceptionObject) { + const { backendAPI } = config; - async function formats() { - const { backendAPI } = config; + try { + await Axios.post(`${backendAPI}/server/exception`, JSON.stringify(exceptionObject), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); + } + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/server/annotation/formats`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function formats() { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/server/annotation/formats`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function userAgreements() { - const { backendAPI } = config; - let response = null; - try { - response = await Axios.get(`${backendAPI}/restrictions/user-agreements`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + return response.data; + } - return response.data; + async function userAgreements() { + const { backendAPI } = config; + let response = null; + try { + response = await Axios.get(`${backendAPI}/restrictions/user-agreements`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function register(username, firstName, lastName, email, password1, password2, confirmations) { - let response = null; - try { - const data = JSON.stringify({ - username, - first_name: firstName, - last_name: lastName, - email, - password1, - password2, - confirmations, - }); - response = await Axios.post(`${config.backendAPI}/auth/register`, data, { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + return response.data; + } - return response.data; + async function register(username, firstName, lastName, email, password1, password2, confirmations) { + let response = null; + try { + const data = JSON.stringify({ + username, + first_name: firstName, + last_name: lastName, + email, + password1, + password2, + confirmations, + }); + response = await Axios.post(`${config.backendAPI}/auth/register`, data, { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function login(username, password) { - const authenticationData = [ - `${encodeURIComponent('username')}=${encodeURIComponent(username)}`, - `${encodeURIComponent('password')}=${encodeURIComponent(password)}`, - ] - .join('&') - .replace(/%20/g, '+'); + return response.data; + } - removeToken(); - let authenticationResponse = null; - try { - authenticationResponse = await Axios.post(`${config.backendAPI}/auth/login`, authenticationData, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function login(username, password) { + const authenticationData = [ + `${encodeURIComponent('username')}=${encodeURIComponent(username)}`, + `${encodeURIComponent('password')}=${encodeURIComponent(password)}`, + ] + .join('&') + .replace(/%20/g, '+'); + + removeToken(); + let authenticationResponse = null; + try { + authenticationResponse = await Axios.post(`${config.backendAPI}/auth/login`, authenticationData, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); + } - if (authenticationResponse.headers['set-cookie']) { - // Browser itself setup cookie and header is none - // In NodeJS we need do it manually - const cookies = authenticationResponse.headers['set-cookie'].join(';'); - Axios.defaults.headers.common.Cookie = cookies; - } + if (authenticationResponse.headers['set-cookie']) { + // Browser itself setup cookie and header is none + // In NodeJS we need do it manually + const cookies = authenticationResponse.headers['set-cookie'].join(';'); + Axios.defaults.headers.common.Cookie = cookies; + } - token = authenticationResponse.data.key; - store.set('token', token); - Axios.defaults.headers.common.Authorization = `Token ${token}`; + token = authenticationResponse.data.key; + store.set('token', token); + Axios.defaults.headers.common.Authorization = `Token ${token}`; + } + + async function logout() { + try { + await Axios.post(`${config.backendAPI}/auth/logout`, { + proxy: config.proxy, + }); + removeToken(); + } catch (errorData) { + throw generateError(errorData); } + } - async function logout() { - try { - await Axios.post(`${config.backendAPI}/auth/logout`, { - proxy: config.proxy, - }); - removeToken(); - } catch (errorData) { - throw generateError(errorData); - } + async function changePassword(oldPassword, newPassword1, newPassword2) { + try { + const data = JSON.stringify({ + old_password: oldPassword, + new_password1: newPassword1, + new_password2: newPassword2, + }); + await Axios.post(`${config.backendAPI}/auth/password/change`, data, { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function changePassword(oldPassword, newPassword1, newPassword2) { - try { - const data = JSON.stringify({ - old_password: oldPassword, - new_password1: newPassword1, - new_password2: newPassword2, - }); - await Axios.post(`${config.backendAPI}/auth/password/change`, data, { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function requestPasswordReset(email) { + try { + const data = JSON.stringify({ + email, + }); + await Axios.post(`${config.backendAPI}/auth/password/reset`, data, { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function requestPasswordReset(email) { - try { - const data = JSON.stringify({ - email, - }); - await Axios.post(`${config.backendAPI}/auth/password/reset`, data, { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function resetPassword(newPassword1, newPassword2, uid, _token) { + try { + const data = JSON.stringify({ + new_password1: newPassword1, + new_password2: newPassword2, + uid, + token: _token, + }); + await Axios.post(`${config.backendAPI}/auth/password/reset/confirm`, data, { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function resetPassword(newPassword1, newPassword2, uid, _token) { - try { - const data = JSON.stringify({ - new_password1: newPassword1, - new_password2: newPassword2, - uid, - token: _token, - }); - await Axios.post(`${config.backendAPI}/auth/password/reset/confirm`, data, { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); + async function authorized() { + try { + await getSelf(); + } catch (serverError) { + if (serverError.code === 401) { + removeToken(); + return false; } - } - async function authorized() { - try { - await module.exports.users.self(); - } catch (serverError) { - if (serverError.code === 401) { - removeToken(); - return false; - } + throw serverError; + } - throw serverError; - } + return true; + } - return true; + async function serverRequest(url, data) { + try { + return ( + await Axios({ + url, + ...data, + }) + ).data; + } catch (errorData) { + throw generateError(errorData); } + } - async function serverRequest(url, data) { - try { - return ( - await Axios({ - url, - ...data, - }) - ).data; - } catch (errorData) { - throw generateError(errorData); - } + async function searchProjectNames(search, limit) { + const { backendAPI, proxy } = config; + + let response = null; + try { + response = await Axios.get(`${backendAPI}/projects`, { + proxy, + params: { + names_only: true, + page: 1, + page_size: limit, + search, + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function searchProjectNames(search, limit) { - const { backendAPI, proxy } = config; + response.data.results.count = response.data.count; + return response.data.results; + } + + async function getProjects(filter = {}) { + const { backendAPI, proxy } = config; - let response = null; - try { - response = await Axios.get(`${backendAPI}/projects`, { + let response = null; + try { + if ('id' in filter) { + response = await Axios.get(`${backendAPI}/projects/${filter.id}`, { proxy, - params: { - names_only: true, - page: 1, - page_size: limit, - search, - }, }); - } catch (errorData) { - throw generateError(errorData); + const results = [response.data]; + results.count = 1; + return results; } - response.data.results.count = response.data.count; - return response.data.results; + response = await Axios.get(`${backendAPI}/projects`, { + params: { + ...filter, + page_size: 12, + }, + proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getProjects(filter = {}) { - const { backendAPI, proxy } = config; - - let response = null; - try { - if ('id' in filter) { - response = await Axios.get(`${backendAPI}/projects/${filter.id}`, { - proxy, - }); - const results = [response.data]; - results.count = 1; - return results; - } + response.data.results.count = response.data.count; + return response.data.results; + } - response = await Axios.get(`${backendAPI}/projects`, { - params: { - ...filter, - page_size: 12, - }, - proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function saveProject(id, projectData) { + const { backendAPI } = config; - response.data.results.count = response.data.count; - return response.data.results; + try { + await Axios.patch(`${backendAPI}/projects/${id}`, JSON.stringify(projectData), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function saveProject(id, projectData) { - const { backendAPI } = config; + async function deleteProject(id) { + const { backendAPI } = config; - try { - await Axios.patch(`${backendAPI}/projects/${id}`, JSON.stringify(projectData), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + try { + await Axios.delete(`${backendAPI}/projects/${id}`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function deleteProject(id) { - const { backendAPI } = config; + async function createProject(projectSpec) { + const { backendAPI } = config; - try { - await Axios.delete(`${backendAPI}/projects/${id}`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } - } - - async function createProject(projectSpec) { - const { backendAPI } = config; - - try { - const response = await Axios.post(`${backendAPI}/projects`, JSON.stringify(projectSpec), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + try { + const response = await Axios.post(`${backendAPI}/projects`, JSON.stringify(projectSpec), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function getTasks(filter = {}) { - const { backendAPI } = config; - - let response = null; - try { - if ('id' in filter) { - response = await Axios.get(`${backendAPI}/tasks/${filter.id}`, { - proxy: config.proxy, - }); - const results = [response.data]; - results.count = 1; - return results; - } + async function getTasks(filter = {}) { + const { backendAPI } = config; - response = await Axios.get(`${backendAPI}/tasks`, { - params: { - ...filter, - page_size: 10, - }, + let response = null; + try { + if ('id' in filter) { + response = await Axios.get(`${backendAPI}/tasks/${filter.id}`, { proxy: config.proxy, }); - } catch (errorData) { - throw generateError(errorData); + const results = [response.data]; + results.count = 1; + return results; } - response.data.results.count = response.data.count; - return response.data.results; + response = await Axios.get(`${backendAPI}/tasks`, { + params: { + ...filter, + page_size: 10, + }, + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function saveTask(id, taskData) { - const { backendAPI } = config; + response.data.results.count = response.data.count; + return response.data.results; + } - let response = null; - try { - response = await Axios.patch(`${backendAPI}/tasks/${id}`, JSON.stringify(taskData), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function saveTask(id, taskData) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.patch(`${backendAPI}/tasks/${id}`, JSON.stringify(taskData), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function deleteTask(id, organizationID = null) { - const { backendAPI } = config; - - try { - await Axios.delete(`${backendAPI}/tasks/${id}`, { - ...(organizationID ? { org: organizationID } : {}), - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } - } + return response.data; + } - function exportDataset(instanceType) { - return async function ( - id: number, - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - name?: string - ) { - const { backendAPI } = config; - const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; - const params: Params = { - ...enableOrganization(), - ...configureStorage(targetStorage, useDefaultSettings), - ...(name ? { filename: name.replace(/\//g, '_') } : {}), - format, - }; - - return new Promise((resolve, reject) => { - async function request() { - Axios.get(baseURL, { - proxy: config.proxy, - params, - }) - .then((response) => { - const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; - const { status } = response; - if (status === 201) params.action = 'download'; - if (status === 202 || (isCloudStorage && status === 201)) { - setTimeout(request, 3000); - } else if (status === 201) { - resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); - } else if (isCloudStorage && status === 200) { - resolve(); - } - }) - .catch((errorData) => { - reject(generateError(errorData)); - }); - } + async function deleteTask(id, organizationID = null) { + const { backendAPI } = config; - setTimeout(request); - }); - }; + try { + await Axios.delete(`${backendAPI}/tasks/${id}`, { + ...(organizationID ? { org: organizationID } : {}), + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function importDataset( + function exportDataset(instanceType) { + return async function ( id: number, format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string, - onUpdate + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + name?: string ) { - const { backendAPI, origin } = config; + const { backendAPI } = config; + const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; const params: Params = { ...enableOrganization(), - ...configureStorage(sourceStorage, useDefaultLocation), + ...configureStorage(targetStorage, useDefaultSettings), + ...(name ? { filename: name.replace(/\//g, '_') } : {}), format, - filename: typeof file === 'string' ? file : file.name, }; - const url = `${backendAPI}/projects/${id}/dataset`; - - async function wait() { - return new Promise((resolve, reject) => { - async function requestStatus() { - try { - const response = await Axios.get(url, { - params: { ...params, action: 'import_status' }, - proxy: config.proxy, - }); - if (response.status === 202) { - if (onUpdate && response.data.message) { - onUpdate(response.data.message, response.data.progress || 0); - } - setTimeout(requestStatus, 3000); - } else if (response.status === 201) { + return new Promise((resolve, reject) => { + async function request() { + Axios.get(baseURL, { + proxy: config.proxy, + params, + }) + .then((response) => { + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { + setTimeout(request, 3000); + } else if (status === 201) { + resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { resolve(); - } else { - reject(generateError(response)); } - } catch (error) { - reject(generateError(error)); - } - } - setTimeout(requestStatus, 2000); - }); - } - const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; - - if (isCloudStorage) { - try { - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, + }) + .catch((errorData) => { + reject(generateError(errorData)); }); - } catch (errorData) { - throw generateError(errorData); } - } else { - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/projects/${id}/dataset/`, - totalSentSize: 0, - totalSize: (file as File).size, - onUpdate: (percentage) => { - onUpdate('The dataset is being uploaded to the server', percentage); - }, - }; - try { - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - await chunkUpload(file, uploadConfig); - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); - } catch (errorData) { - throw generateError(errorData); - } - } - try { - return wait(); - } catch (errorData) { - throw generateError(errorData); - } - } + setTimeout(request); + }); + }; + } - async function exportTask(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { - const { backendAPI } = config; - const params: Params = { - ...enableOrganization(), - ...configureStorage(targetStorage, useDefaultSettings), - ...(fileName ? { filename: fileName } : {}) - }; - const url = `${backendAPI}/tasks/${id}/backup`; + async function importDataset( + id: number, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string, + onUpdate + ) { + const { backendAPI, origin } = config; + const params: Params = { + ...enableOrganization(), + ...configureStorage(sourceStorage, useDefaultLocation), + format, + filename: typeof file === 'string' ? file : file.name, + }; - return new Promise((resolve, reject) => { - async function request() { + const url = `${backendAPI}/projects/${id}/dataset`; + + async function wait() { + return new Promise((resolve, reject) => { + async function requestStatus() { try { const response = await Axios.get(url, { + params: { ...params, action: 'import_status' }, proxy: config.proxy, - params, }); - const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; - const { status } = response; - if (status === 201) params.action = 'download'; - if (status === 202 || (isCloudStorage && status === 201)) { - setTimeout(request, 3000); - } else if (status === 201) { - resolve(`${url}?${new URLSearchParams(params).toString()}`); - } else if (isCloudStorage && status === 200) { + if (response.status === 202) { + if (onUpdate && response.data.message) { + onUpdate(response.data.message, response.data.progress || 0); + } + setTimeout(requestStatus, 3000); + } else if (response.status === 201) { resolve(); + } else { + reject(generateError(response)); } - } catch (errorData) { - reject(generateError(errorData)); + } catch (error) { + reject(generateError(error)); } } - - setTimeout(request); + setTimeout(requestStatus, 2000); }); } + const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; - async function importTask(storage: Storage, file: File | string) { - const { backendAPI } = config; - // keep current default params to 'freeze" them during this request - const params: Params = { - ...enableOrganization(), - ...configureStorage(storage), - }; - - const url = `${backendAPI}/tasks/backup`; - const taskData = new FormData(); - let response; - - async function wait(taskData, response) { - return new Promise((resolve, reject) => { - async function checkStatus() { - try { - taskData.set('rq_id', response.data.rq_id); - response = await Axios.post(url, taskData, { - proxy: config.proxy, - params, - }); - if (response.status === 202) { - setTimeout(checkStatus, 3000); - } else { - // to be able to get the task after it was created, pass frozen params - const importedTask = await getTasks({ id: response.data.id, ...params }); - resolve(importedTask[0]); - } - } catch (errorData) { - reject(generateError(errorData)); - } - } - setTimeout(checkStatus); - }); - } - const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; - - if (isCloudStorage) { - params.filename = file as string; - response = await Axios.post(url, + if (isCloudStorage) { + try { + await Axios.post(url, new FormData(), { params, proxy: config.proxy, }); - } else { - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/tasks/backup/`, - totalSentSize: 0, - totalSize: (file as File).size, - }; + } catch (errorData) { + throw generateError(errorData); + } + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/projects/${id}/dataset/`, + totalSentSize: 0, + totalSize: (file as File).size, + onUpdate: (percentage) => { + onUpdate('The dataset is being uploaded to the server', percentage); + }, + }; + + try { await Axios.post(url, new FormData(), { params, proxy: config.proxy, headers: { 'Upload-Start': true }, }); - const { filename } = await chunkUpload(file, uploadConfig); - response = await Axios.post(url, + await chunkUpload(file, uploadConfig); + await Axios.post(url, new FormData(), { - params: { ...params, filename }, + params, proxy: config.proxy, headers: { 'Upload-Finish': true }, }); + } catch (errorData) { + throw generateError(errorData); } - return wait(taskData, response); } + try { + return wait(); + } catch (errorData) { + throw generateError(errorData); + } + } - async function exportProject(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { - const { backendAPI } = config; - // keep current default params to 'freeze" them during this request - const params: Params = { - ...enableOrganization(), - ...configureStorage(targetStorage, useDefaultSettings), - ...(fileName ? { filename: fileName } : {}) - }; + async function exportTask(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + const { backendAPI } = config; + const params: Params = { + ...enableOrganization(), + ...configureStorage(targetStorage, useDefaultSettings), + ...(fileName ? { filename: fileName } : {}) + }; + const url = `${backendAPI}/tasks/${id}/backup`; - const url = `${backendAPI}/projects/${id}/backup`; + return new Promise((resolve, reject) => { + async function request() { + try { + const response = await Axios.get(url, { + proxy: config.proxy, + params, + }); + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { + setTimeout(request, 3000); + } else if (status === 201) { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { + resolve(); + } + } catch (errorData) { + reject(generateError(errorData)); + } + } - return new Promise((resolve, reject) => { - async function request() { + setTimeout(request); + }); + } + + async function importTask(storage: Storage, file: File | string) { + const { backendAPI } = config; + // keep current default params to 'freeze" them during this request + const params: Params = { + ...enableOrganization(), + ...configureStorage(storage), + }; + + const url = `${backendAPI}/tasks/backup`; + const taskData = new FormData(); + let response; + + async function wait(taskData, response) { + return new Promise((resolve, reject) => { + async function checkStatus() { try { - const response = await Axios.get(url, { + taskData.set('rq_id', response.data.rq_id); + response = await Axios.post(url, taskData, { proxy: config.proxy, params, }); - const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; - const { status } = response; - if (status === 201) params.action = 'download'; - if (status === 202 || (isCloudStorage && status === 201)) { - setTimeout(request, 3000); - } else if (status === 201) { - resolve(`${url}?${new URLSearchParams(params).toString()}`); - } else if (isCloudStorage && status === 200) { - resolve(); + if (response.status === 202) { + setTimeout(checkStatus, 3000); + } else { + // to be able to get the task after it was created, pass frozen params + const importedTask = await getTasks({ id: response.data.id, ...params }); + resolve(importedTask[0]); } } catch (errorData) { reject(generateError(errorData)); } } - - setTimeout(request); + setTimeout(checkStatus); }); } + const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; - async function importProject(storage: Storage, file: File | string) { - const { backendAPI } = config; - // keep current default params to 'freeze" them during this request - const params: Params = { - ...enableOrganization(), - ...configureStorage(storage), - } - - const url = `${backendAPI}/projects/backup`; - const projectData = new FormData(); - let response; - - async function wait(projectData, response) { - return new Promise((resolve, reject) => { - async function request() { - try { - projectData.set('rq_id', response.data.rq_id); - response = await Axios.post(`${backendAPI}/projects/backup`, projectData, { - proxy: config.proxy, - params, - }); - if (response.status === 202) { - setTimeout(request, 3000); - } else { - // to be able to get the task after it was created, pass frozen params - const restoredProject = await getProjects({ id: response.data.id, ...params }); - resolve(restoredProject[0]); - } - } catch (errorData) { - reject(generateError(errorData)); - } - } - - setTimeout(request); + if (isCloudStorage) { + params.filename = file as string; + response = await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, }); + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/tasks/backup/`, + totalSentSize: 0, + totalSize: (file as File).size, }; - const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + const { filename } = await chunkUpload(file, uploadConfig); + response = await Axios.post(url, + new FormData(), { + params: { ...params, filename }, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); + } + return wait(taskData, response); + } - if (isCloudStorage) { - params.filename = file; - response = await Axios.post(url, - new FormData(), { - params, + async function exportProject( + id: number, + targetStorage: Storage, + useDefaultSettings: boolean, + fileName?: string + ) { + const { backendAPI } = config; + // keep current default params to 'freeze" them during this request + const params: Params = { + ...enableOrganization(), + ...configureStorage(targetStorage, useDefaultSettings), + ...(fileName ? { filename: fileName } : {}) + }; + + const url = `${backendAPI}/projects/${id}/backup`; + + return new Promise((resolve, reject) => { + async function request() { + try { + const response = await Axios.get(url, { proxy: config.proxy, - }); - } else { - const uploadConfig = { - chunkSize: config.uploadChunkSize * 1024 * 1024, - endpoint: `${origin}${backendAPI}/projects/backup/`, - totalSentSize: 0, - totalSize: (file as File).size, - }; - await Axios.post(url, - new FormData(), { params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, }); - const { filename } = await chunkUpload(file, uploadConfig); - response = await Axios.post(url, - new FormData(), { - params: { ...params, filename }, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - } - ); - } - return wait(projectData, response); - } - - async function createTask(taskSpec, taskDataSpec, onUpdate) { - const { backendAPI, origin } = config; - // keep current default params to 'freeze" them during this request - const params = enableOrganization(); - - async function wait(id) { - return new Promise((resolve, reject) => { - async function checkStatus() { - try { - const response = await Axios.get(`${backendAPI}/tasks/${id}/status`, { params }); - if (['Queued', 'Started'].includes(response.data.state)) { - if (response.data.message !== '') { - onUpdate(response.data.message, response.data.progress || 0); - } - setTimeout(checkStatus, 1000); - } else if (response.data.state === 'Finished') { - resolve(); - } else if (response.data.state === 'Failed') { - // If request has been successful, but task hasn't been created - // Then passed data is wrong and we can pass code 400 - const message = ` - Could not create the task on the server. ${response.data.message}. - `; - reject(new ServerError(message, 400)); - } else { - // If server has another status, it is unexpected - // Therefore it is server error and we can pass code 500 - reject( - new ServerError( - `Unknown task state has been received: ${response.data.state}`, - 500, - ), - ); - } - } catch (errorData) { - reject(generateError(errorData)); - } + const isCloudStorage = targetStorage.location === StorageLocation.CLOUD_STORAGE; + const { status } = response; + if (status === 201) params.action = 'download'; + if (status === 202 || (isCloudStorage && status === 201)) { + setTimeout(request, 3000); + } else if (status === 201) { + resolve(`${url}?${new URLSearchParams(params).toString()}`); + } else if (isCloudStorage && status === 200) { + resolve(); } - - setTimeout(checkStatus, 1000); - }); - } - - const chunkSize = config.uploadChunkSize * 1024 * 1024; - const clientFiles = taskDataSpec.client_files; - const chunkFiles = []; - const bulkFiles = []; - let totalSize = 0; - let totalSentSize = 0; - for (const file of clientFiles) { - if (file.size > chunkSize) { - chunkFiles.push(file); - } else { - bulkFiles.push(file); - } - totalSize += file.size; - } - delete taskDataSpec.client_files; - - const taskData = new FormData(); - for (const [key, value] of Object.entries(taskDataSpec)) { - if (Array.isArray(value)) { - value.forEach((element, idx) => { - taskData.append(`${key}[${idx}]`, element); - }); - } else { - taskData.set(key, value); + } catch (errorData) { + reject(generateError(errorData)); } } - let response = null; + setTimeout(request); + }); + } - onUpdate('The task is being created on the server..', null); - try { - response = await Axios.post(`${backendAPI}/tasks`, JSON.stringify(taskSpec), { - proxy: config.proxy, - params, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function importProject(storage: Storage, file: File | string) { + const { backendAPI } = config; + // keep current default params to 'freeze" them during this request + const params: Params = { + ...enableOrganization(), + ...configureStorage(storage), + } - onUpdate('The data are being uploaded to the server..', null); + const url = `${backendAPI}/projects/backup`; + const projectData = new FormData(); + let response; - async function bulkUpload(taskId, files) { - const fileBulks = files.reduce((fileGroups, file) => { - const lastBulk = fileGroups[fileGroups.length - 1]; - if (chunkSize - lastBulk.size >= file.size) { - lastBulk.files.push(file); - lastBulk.size += file.size; - } else { - fileGroups.push({ files: [file], size: file.size }); - } - return fileGroups; - }, [{ files: [], size: 0 }]); - const totalBulks = fileBulks.length; - let currentChunkNumber = 0; - while (currentChunkNumber < totalBulks) { - for (const [idx, element] of fileBulks[currentChunkNumber].files.entries()) { - taskData.append(`client_files[${idx}]`, element); - } - const percentage = totalSentSize / totalSize; - onUpdate('The data are being uploaded to the server', percentage); - await Axios.post(`${backendAPI}/tasks/${taskId}/data`, taskData, { - ...params, - proxy: config.proxy, - headers: { 'Upload-Multiple': true }, - }); - for (let i = 0; i < fileBulks[currentChunkNumber].files.length; i++) { - taskData.delete(`client_files[${i}]`); + async function wait(projectData, response) { + return new Promise((resolve, reject) => { + async function request() { + try { + projectData.set('rq_id', response.data.rq_id); + response = await Axios.post(`${backendAPI}/projects/backup`, projectData, { + proxy: config.proxy, + params, + }); + if (response.status === 202) { + setTimeout(request, 3000); + } else { + // to be able to get the task after it was created, pass frozen params + const restoredProject = await getProjects({ id: response.data.id, ...params }); + resolve(restoredProject[0]); + } + } catch (errorData) { + reject(generateError(errorData)); } - totalSentSize += fileBulks[currentChunkNumber].size; - currentChunkNumber++; } - } - try { - await Axios.post(`${backendAPI}/tasks/${response.data.id}/data`, - taskData, { - ...params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - const uploadConfig = { - endpoint: `${origin}${backendAPI}/tasks/${response.data.id}/data/`, - onUpdate: (percentage) => { - onUpdate('The data are being uploaded to the server', percentage); - }, - chunkSize, - totalSize, - totalSentSize, - }; - for (const file of chunkFiles) { - uploadConfig.totalSentSize += await chunkUpload(file, uploadConfig); - } - if (bulkFiles.length > 0) { - await bulkUpload(response.data.id, bulkFiles); + setTimeout(request); + }); + }; + const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; + + if (isCloudStorage) { + params.filename = file; + response = await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); + } else { + const uploadConfig = { + chunkSize: config.uploadChunkSize * 1024 * 1024, + endpoint: `${origin}${backendAPI}/projects/backup/`, + totalSentSize: 0, + totalSize: (file as File).size, + }; + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + const { filename } = await chunkUpload(file, uploadConfig); + response = await Axios.post(url, + new FormData(), { + params: { ...params, filename }, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, } - await Axios.post(`${backendAPI}/tasks/${response.data.id}/data`, - taskData, { - ...params, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); - } catch (errorData) { - try { - await deleteTask(response.data.id, params.org || null); - } catch (_) { - // ignore + ); + } + return wait(projectData, response); + } + + async function createTask(taskSpec, taskDataSpec, onUpdate) { + const { backendAPI, origin } = config; + // keep current default params to 'freeze" them during this request + const params = enableOrganization(); + + async function wait(id) { + return new Promise((resolve, reject) => { + async function checkStatus() { + try { + const response = await Axios.get(`${backendAPI}/tasks/${id}/status`, { params }); + if (['Queued', 'Started'].includes(response.data.state)) { + if (response.data.message !== '') { + onUpdate(response.data.message, response.data.progress || 0); + } + setTimeout(checkStatus, 1000); + } else if (response.data.state === 'Finished') { + resolve(); + } else if (response.data.state === 'Failed') { + // If request has been successful, but task hasn't been created + // Then passed data is wrong and we can pass code 400 + const message = ` + Could not create the task on the server. ${response.data.message}. + `; + reject(new ServerError(message, 400)); + } else { + // If server has another status, it is unexpected + // Therefore it is server error and we can pass code 500 + reject( + new ServerError( + `Unknown task state has been received: ${response.data.state}`, + 500, + ), + ); + } + } catch (errorData) { + reject(generateError(errorData)); + } } - throw generateError(errorData); + + setTimeout(checkStatus, 1000); + }); + } + + const chunkSize = config.uploadChunkSize * 1024 * 1024; + const clientFiles = taskDataSpec.client_files; + const chunkFiles = []; + const bulkFiles = []; + let totalSize = 0; + let totalSentSize = 0; + for (const file of clientFiles) { + if (file.size > chunkSize) { + chunkFiles.push(file); + } else { + bulkFiles.push(file); } + totalSize += file.size; + } + delete taskDataSpec.client_files; - try { - await wait(response.data.id); - } catch (createException) { - await deleteTask(response.data.id, params.org || null); - throw createException; + const taskData = new FormData(); + for (const [key, value] of Object.entries(taskDataSpec)) { + if (Array.isArray(value)) { + value.forEach((element, idx) => { + taskData.append(`${key}[${idx}]`, element); + }); + } else { + taskData.set(key, value); } + } + + let response = null; - // to be able to get the task after it was created, pass frozen params - const createdTask = await getTasks({ id: response.data.id, ...params }); - return createdTask[0]; + onUpdate('The task is being created on the server..', null); + try { + response = await Axios.post(`${backendAPI}/tasks`, JSON.stringify(taskSpec), { + proxy: config.proxy, + params, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getJobs(filter = {}) { - const { backendAPI } = config; - const id = filter.id || null; + onUpdate('The data are being uploaded to the server..', null); - let response = null; - try { - if (id !== null) { - response = await Axios.get(`${backendAPI}/jobs/${id}`, { - proxy: config.proxy, - }); + async function bulkUpload(taskId, files) { + const fileBulks = files.reduce((fileGroups, file) => { + const lastBulk = fileGroups[fileGroups.length - 1]; + if (chunkSize - lastBulk.size >= file.size) { + lastBulk.files.push(file); + lastBulk.size += file.size; } else { - response = await Axios.get(`${backendAPI}/jobs`, { - proxy: config.proxy, - params: { - ...filter, - page_size: 12, - }, - }); + fileGroups.push({ files: [file], size: file.size }); } - } catch (errorData) { - throw generateError(errorData); + return fileGroups; + }, [{ files: [], size: 0 }]); + const totalBulks = fileBulks.length; + let currentChunkNumber = 0; + while (currentChunkNumber < totalBulks) { + for (const [idx, element] of fileBulks[currentChunkNumber].files.entries()) { + taskData.append(`client_files[${idx}]`, element); + } + const percentage = totalSentSize / totalSize; + onUpdate('The data are being uploaded to the server', percentage); + await Axios.post(`${backendAPI}/tasks/${taskId}/data`, taskData, { + ...params, + proxy: config.proxy, + headers: { 'Upload-Multiple': true }, + }); + for (let i = 0; i < fileBulks[currentChunkNumber].files.length; i++) { + taskData.delete(`client_files[${i}]`); + } + totalSentSize += fileBulks[currentChunkNumber].size; + currentChunkNumber++; } - - return response.data; } - async function getJobIssues(jobID) { - const { backendAPI } = config; - - let response = null; - try { - response = await Axios.get(`${backendAPI}/jobs/${jobID}/issues`, { + try { + await Axios.post(`${backendAPI}/tasks/${response.data.id}/data`, + taskData, { + ...params, proxy: config.proxy, + headers: { 'Upload-Start': true }, }); - } catch (errorData) { - throw generateError(errorData); + const uploadConfig = { + endpoint: `${origin}${backendAPI}/tasks/${response.data.id}/data/`, + onUpdate: (percentage) => { + onUpdate('The data are being uploaded to the server', percentage); + }, + chunkSize, + totalSize, + totalSentSize, + }; + for (const file of chunkFiles) { + uploadConfig.totalSentSize += await chunkUpload(file, uploadConfig); + } + if (bulkFiles.length > 0) { + await bulkUpload(response.data.id, bulkFiles); } + await Axios.post(`${backendAPI}/tasks/${response.data.id}/data`, + taskData, { + ...params, + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); + } catch (errorData) { + try { + await deleteTask(response.data.id, params.org || null); + } catch (_) { + // ignore + } + throw generateError(errorData); + } - return response.data; + try { + await wait(response.data.id); + } catch (createException) { + await deleteTask(response.data.id, params.org || null); + throw createException; } - async function createComment(data) { - const { backendAPI } = config; + // to be able to get the task after it was created, pass frozen params + const createdTask = await getTasks({ id: response.data.id, ...params }); + return createdTask[0]; + } - let response = null; - try { - response = await Axios.post(`${backendAPI}/comments`, JSON.stringify(data), { + async function getJobs(filter = {}) { + const { backendAPI } = config; + const id = filter.id || null; + + let response = null; + try { + if (id !== null) { + response = await Axios.get(`${backendAPI}/jobs/${id}`, { proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', + }); + } else { + response = await Axios.get(`${backendAPI}/jobs`, { + proxy: config.proxy, + params: { + ...filter, + page_size: 12, }, }); - } catch (errorData) { - throw generateError(errorData); } + } catch (errorData) { + throw generateError(errorData); + } - return response.data; + return response.data; + } + + async function getJobIssues(jobID) { + const { backendAPI } = config; + + let response = null; + try { + response = await Axios.get(`${backendAPI}/jobs/${jobID}/issues`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function createIssue(data) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.post(`${backendAPI}/issues`, JSON.stringify(data), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function createComment(data) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.post(`${backendAPI}/comments`, JSON.stringify(data), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function updateIssue(issueID, data) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.patch(`${backendAPI}/issues/${issueID}`, JSON.stringify(data), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function createIssue(data) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.post(`${backendAPI}/issues`, JSON.stringify(data), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function deleteIssue(issueID) { - const { backendAPI } = config; + return response.data; + } - try { - await Axios.delete(`${backendAPI}/issues/${issueID}`); - } catch (errorData) { - throw generateError(errorData); - } + async function updateIssue(issueID, data) { + const { backendAPI } = config; + + let response = null; + try { + response = await Axios.patch(`${backendAPI}/issues/${issueID}`, JSON.stringify(data), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function saveJob(id, jobData) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.patch(`${backendAPI}/jobs/${id}`, JSON.stringify(jobData), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function deleteIssue(issueID) { + const { backendAPI } = config; - return response.data; + try { + await Axios.delete(`${backendAPI}/issues/${issueID}`); + } catch (errorData) { + throw generateError(errorData); } + } - async function getUsers(filter = { page_size: 'all' }) { - const { backendAPI } = config; + async function saveJob(id, jobData) { + const { backendAPI } = config; - let response = null; - try { - response = await Axios.get(`${backendAPI}/users`, { - proxy: config.proxy, - params: { - ...filter, - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + let response = null; + try { + response = await Axios.patch(`${backendAPI}/jobs/${id}`, JSON.stringify(jobData), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); + } + + return response.data; + } - return response.data.results; + async function getUsers(filter = { page_size: 'all' }) { + const { backendAPI } = config; + + let response = null; + try { + response = await Axios.get(`${backendAPI}/users`, { + proxy: config.proxy, + params: { + ...filter, + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getSelf() { - const { backendAPI } = config; + return response.data.results; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/users/self`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getSelf() { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/users/self`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getPreview(tid, jid) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - const url = `${backendAPI}/${jid !== null ? 'jobs' : 'tasks'}/${jid || tid}/data`; - response = await Axios.get(url, { - params: { - type: 'preview', - }, - proxy: config.proxy, - responseType: 'blob', - }); - } catch (errorData) { - const code = errorData.response ? errorData.response.status : errorData.code; - throw new ServerError(`Could not get preview frame for the task ${tid} from the server`, code); - } + async function getPreview(tid, jid) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + const url = `${backendAPI}/${jid !== null ? 'jobs' : 'tasks'}/${jid || tid}/data`; + response = await Axios.get(url, { + params: { + type: 'preview', + }, + proxy: config.proxy, + responseType: 'blob', + }); + } catch (errorData) { + const code = errorData.response ? errorData.response.status : errorData.code; + throw new ServerError(`Could not get preview frame for the task ${tid} from the server`, code); } - async function getImageContext(jid, frame) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/jobs/${jid}/data`, { - params: { - quality: 'original', - type: 'context_image', - number: frame, - }, - proxy: config.proxy, - responseType: 'blob', - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getImageContext(jid, frame) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/jobs/${jid}/data`, { + params: { + quality: 'original', + type: 'context_image', + number: frame, + }, + proxy: config.proxy, + responseType: 'blob', + }); + } catch (errorData) { + throw generateError(errorData); } - async function getData(tid, jid, chunk) { - const { backendAPI } = config; + return response.data; + } - const url = jid === null ? `tasks/${tid}/data` : `jobs/${jid}/data`; + async function getData(tid, jid, chunk) { + const { backendAPI } = config; - let response = null; - try { - response = await workerAxios.get(`${backendAPI}/${url}`, { - params: { - ...enableOrganization(), - quality: 'compressed', - type: 'chunk', - number: chunk, - }, - proxy: config.proxy, - responseType: 'arraybuffer', - }); - } catch (errorData) { - throw generateError({ - message: '', - response: { - ...errorData.response, - data: String.fromCharCode.apply(null, new Uint8Array(errorData.response.data)), - }, - }); - } + const url = jid === null ? `tasks/${tid}/data` : `jobs/${jid}/data`; - return response; + let response = null; + try { + response = await workerAxios.get(`${backendAPI}/${url}`, { + params: { + ...enableOrganization(), + quality: 'compressed', + type: 'chunk', + number: chunk, + }, + proxy: config.proxy, + responseType: 'arraybuffer', + }); + } catch (errorData) { + throw generateError({ + message: '', + response: { + ...errorData.response, + data: String.fromCharCode.apply(null, new Uint8Array(errorData.response.data)), + }, + }); } - async function getMeta(session, jid) { - const { backendAPI } = config; + return response; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/${session}s/${jid}/data/meta`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getMeta(session, jid) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/${session}s/${jid}/data/meta`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function saveMeta(session, jid, meta) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.patch(`${backendAPI}/${session}s/${jid}/data/meta`, meta, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function saveMeta(session, jid, meta) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.patch(`${backendAPI}/${session}s/${jid}/data/meta`, meta, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - // Session is 'task' or 'job' - async function getAnnotations(session, id) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/${session}s/${id}/annotations`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + // Session is 'task' or 'job' + async function getAnnotations(session, id) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/${session}s/${id}/annotations`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - // Session is 'task' or 'job' - async function updateAnnotations(session, id, data, action) { - const { backendAPI } = config; - const url = `${backendAPI}/${session}s/${id}/annotations`; - const params = {}; - let requestFunc = null; + return response.data; + } - if (action.toUpperCase() === 'PUT') { - requestFunc = Axios.put.bind(Axios); - } else { - requestFunc = Axios.patch.bind(Axios); - params.action = action; - } + // Session is 'task' or 'job' + async function updateAnnotations(session, id, data, action) { + const { backendAPI } = config; + const url = `${backendAPI}/${session}s/${id}/annotations`; + const params = {}; + let requestFunc = null; - let response = null; - try { - response = await requestFunc(url, JSON.stringify(data), { - proxy: config.proxy, - params, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } - - return response.data; + if (action.toUpperCase() === 'PUT') { + requestFunc = Axios.put.bind(Axios); + } else { + requestFunc = Axios.patch.bind(Axios); + params.action = action; } - // Session is 'task' or 'job' - async function uploadAnnotations( - session, - id: number, - format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string - ) { - const { backendAPI, origin } = config; - const params: Params = { - ...enableOrganization(), - ...configureStorage(sourceStorage, useDefaultLocation), - format, - filename: typeof file === 'string' ? file : file.name, - }; + let response = null; + try { + response = await requestFunc(url, JSON.stringify(data), { + proxy: config.proxy, + params, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); + } - const url = `${backendAPI}/${session}s/${id}/annotations`; - - async function wait() { - return new Promise((resolve, reject) => { - async function requestStatus() { - try { - const response = await Axios.put( - url, - new FormData(), - { - params, - proxy: config.proxy, - }, - ); - if (response.status === 202) { - setTimeout(requestStatus, 3000); - } else { - resolve(); - } - } catch (errorData) { - reject(generateError(errorData)); - } - } - setTimeout(requestStatus); - }); - } - const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; + return response.data; + } - if (isCloudStorage) { - try { - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } - } else { - const chunkSize = config.uploadChunkSize * 1024 * 1024; - const uploadConfig = { - chunkSize, - endpoint: `${origin}${backendAPI}/${session}s/${id}/annotations/`, - }; + // Session is 'task' or 'job' + async function uploadAnnotations( + session, + id: number, + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string + ) { + const { backendAPI, origin } = config; + const params: Params = { + ...enableOrganization(), + ...configureStorage(sourceStorage, useDefaultLocation), + format, + filename: typeof file === 'string' ? file : file.name, + }; - try { - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Start': true }, - }); - await chunkUpload(file, uploadConfig); - await Axios.post(url, - new FormData(), { - params, - proxy: config.proxy, - headers: { 'Upload-Finish': true }, - }); + const url = `${backendAPI}/${session}s/${id}/annotations`; - } catch (errorData) { - throw generateError(errorData); + async function wait() { + return new Promise((resolve, reject) => { + async function requestStatus() { + try { + const response = await Axios.put( + url, + new FormData(), + { + params, + proxy: config.proxy, + }, + ); + if (response.status === 202) { + setTimeout(requestStatus, 3000); + } else { + resolve(); + } + } catch (errorData) { + reject(generateError(errorData)); + } } - } + setTimeout(requestStatus); + }); + } + const isCloudStorage = sourceStorage.location === StorageLocation.CLOUD_STORAGE; + if (isCloudStorage) { try { - return wait(); + await Axios.post(url, + new FormData(), { + params, + proxy: config.proxy, + }); } catch (errorData) { throw generateError(errorData); } - } - - // Session is 'task' or 'job' - async function dumpAnnotations(id, name, format) { - const { backendAPI } = config; - const baseURL = `${backendAPI}/tasks/${id}/annotations`; - const params = enableOrganization(); - params.format = encodeURIComponent(format); - if (name) { - const filename = name.replace(/\//g, '_'); - params.filename = encodeURIComponent(filename); - } + } else { + const chunkSize = config.uploadChunkSize * 1024 * 1024; + const uploadConfig = { + chunkSize, + endpoint: `${origin}${backendAPI}/${session}s/${id}/annotations/`, + }; - return new Promise((resolve, reject) => { - async function request() { - Axios.get(baseURL, { + try { + await Axios.post(url, + new FormData(), { + params, proxy: config.proxy, + headers: { 'Upload-Start': true }, + }); + await chunkUpload(file, uploadConfig); + await Axios.post(url, + new FormData(), { params, - }) - .then((response) => { - if (response.status === 202) { - setTimeout(request, 3000); - } else { - params.action = 'download'; - resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); - } - }) - .catch((errorData) => { - reject(generateError(errorData)); - }); - } - - setTimeout(request); - }); - } - - async function saveLogs(logs) { - const { backendAPI } = config; + proxy: config.proxy, + headers: { 'Upload-Finish': true }, + }); - try { - await Axios.post(`${backendAPI}/server/logs`, JSON.stringify(logs), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); } catch (errorData) { throw generateError(errorData); } } - async function getLambdaFunctions() { - const { backendAPI } = config; + try { + return wait(); + } catch (errorData) { + throw generateError(errorData); + } + } - try { - const response = await Axios.get(`${backendAPI}/lambda/functions`, { + // Session is 'task' or 'job' + async function dumpAnnotations(id, name, format) { + const { backendAPI } = config; + const baseURL = `${backendAPI}/tasks/${id}/annotations`; + const params = enableOrganization(); + params.format = encodeURIComponent(format); + if (name) { + const filename = name.replace(/\//g, '_'); + params.filename = encodeURIComponent(filename); + } + + return new Promise((resolve, reject) => { + async function request() { + Axios.get(baseURL, { proxy: config.proxy, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); + params, + }) + .then((response) => { + if (response.status === 202) { + setTimeout(request, 3000); + } else { + params.action = 'download'; + resolve(`${baseURL}?${new URLSearchParams(params).toString()}`); + } + }) + .catch((errorData) => { + reject(generateError(errorData)); + }); } + + setTimeout(request); + }); + } + + async function saveLogs(logs) { + const { backendAPI } = config; + + try { + await Axios.post(`${backendAPI}/server/logs`, JSON.stringify(logs), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function runLambdaRequest(body) { - const { backendAPI } = config; + async function getLambdaFunctions() { + const { backendAPI } = config; - try { - const response = await Axios.post(`${backendAPI}/lambda/requests`, JSON.stringify(body), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); + try { + const response = await Axios.get(`${backendAPI}/lambda/functions`, { + proxy: config.proxy, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); + } + } - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + async function runLambdaRequest(body) { + const { backendAPI } = config; + + try { + const response = await Axios.post(`${backendAPI}/lambda/requests`, JSON.stringify(body), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function callLambdaFunction(funId, body) { - const { backendAPI } = config; + async function callLambdaFunction(funId, body) { + const { backendAPI } = config; - try { - const response = await Axios.post(`${backendAPI}/lambda/functions/${funId}`, JSON.stringify(body), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); + try { + const response = await Axios.post(`${backendAPI}/lambda/functions/${funId}`, JSON.stringify(body), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function getLambdaRequests() { - const { backendAPI } = config; + async function getLambdaRequests() { + const { backendAPI } = config; - try { - const response = await Axios.get(`${backendAPI}/lambda/requests`, { - proxy: config.proxy, - }); + try { + const response = await Axios.get(`${backendAPI}/lambda/requests`, { + proxy: config.proxy, + }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function getRequestStatus(requestID) { - const { backendAPI } = config; + async function getRequestStatus(requestID) { + const { backendAPI } = config; - try { - const response = await Axios.get(`${backendAPI}/lambda/requests/${requestID}`, { - proxy: config.proxy, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + try { + const response = await Axios.get(`${backendAPI}/lambda/requests/${requestID}`, { + proxy: config.proxy, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function cancelLambdaRequest(requestId) { - const { backendAPI } = config; + async function cancelLambdaRequest(requestId) { + const { backendAPI } = config; - try { - await Axios.delete(`${backendAPI}/lambda/requests/${requestId}`, { - method: 'DELETE', - }); - } catch (errorData) { - throw generateError(errorData); - } + try { + await Axios.delete(`${backendAPI}/lambda/requests/${requestId}`, { + method: 'DELETE', + }); + } catch (errorData) { + throw generateError(errorData); } + } - function predictorStatus(projectId) { - const { backendAPI } = config; + function predictorStatus(projectId) { + const { backendAPI } = config; - return new Promise((resolve, reject) => { - async function request() { - try { - const response = await Axios.get(`${backendAPI}/predict/status`, { - params: { - project: projectId, - }, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + return new Promise((resolve, reject) => { + async function request() { + try { + const response = await Axios.get(`${backendAPI}/predict/status`, { + params: { + project: projectId, + }, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - const timeoutCallback = async () => { - let data = null; - try { - data = await request(); - if (data.status === 'queued') { - setTimeout(timeoutCallback, 1000); - } else if (data.status === 'done') { - resolve(data); - } else { - throw new Error(`Unknown status was received "${data.status}"`); - } - } catch (error) { - reject(error); + const timeoutCallback = async () => { + let data = null; + try { + data = await request(); + if (data.status === 'queued') { + setTimeout(timeoutCallback, 1000); + } else if (data.status === 'done') { + resolve(data); + } else { + throw new Error(`Unknown status was received "${data.status}"`); } - }; + } catch (error) { + reject(error); + } + }; - setTimeout(timeoutCallback); - }); - } + setTimeout(timeoutCallback); + }); + } - function predictAnnotations(taskId, frame) { - return new Promise((resolve, reject) => { - const { backendAPI } = config; + function predictAnnotations(taskId, frame) { + return new Promise((resolve, reject) => { + const { backendAPI } = config; - async function request() { - try { - const response = await Axios.get(`${backendAPI}/predict/frame`, { - params: { - task: taskId, - frame, - }, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + async function request() { + try { + const response = await Axios.get(`${backendAPI}/predict/frame`, { + params: { + task: taskId, + frame, + }, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - const timeoutCallback = async () => { - let data = null; - try { - data = await request(); - if (data.status === 'queued') { - setTimeout(timeoutCallback, 1000); - } else if (data.status === 'done') { - predictAnnotations.latestRequest.fetching = false; - resolve(data.annotation); - } else { - throw new Error(`Unknown status was received "${data.status}"`); - } - } catch (error) { + const timeoutCallback = async () => { + let data = null; + try { + data = await request(); + if (data.status === 'queued') { + setTimeout(timeoutCallback, 1000); + } else if (data.status === 'done') { predictAnnotations.latestRequest.fetching = false; - reject(error); + resolve(data.annotation); + } else { + throw new Error(`Unknown status was received "${data.status}"`); } - }; - - const closureId = Date.now(); - predictAnnotations.latestRequest.id = closureId; - const predicate = () => !predictAnnotations.latestRequest.fetching || - predictAnnotations.latestRequest.id !== closureId; - if (predictAnnotations.latestRequest.fetching) { - waitFor(5, predicate).then(() => { - if (predictAnnotations.latestRequest.id !== closureId) { - resolve(null); - } else { - predictAnnotations.latestRequest.fetching = true; - setTimeout(timeoutCallback); - } - }); - } else { - predictAnnotations.latestRequest.fetching = true; - setTimeout(timeoutCallback); + } catch (error) { + predictAnnotations.latestRequest.fetching = false; + reject(error); } + }; + + const closureId = Date.now(); + predictAnnotations.latestRequest.id = closureId; + const predicate = () => !predictAnnotations.latestRequest.fetching || + predictAnnotations.latestRequest.id !== closureId; + if (predictAnnotations.latestRequest.fetching) { + waitFor(5, predicate).then(() => { + if (predictAnnotations.latestRequest.id !== closureId) { + resolve(null); + } else { + predictAnnotations.latestRequest.fetching = true; + setTimeout(timeoutCallback); + } + }); + } else { + predictAnnotations.latestRequest.fetching = true; + setTimeout(timeoutCallback); + } + }); + } + + predictAnnotations.latestRequest = { + fetching: false, + id: null, + }; + + async function installedApps() { + const { backendAPI } = config; + try { + const response = await Axios.get(`${backendAPI}/server/plugins`, { + proxy: config.proxy, }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - predictAnnotations.latestRequest = { - fetching: false, - id: null, - }; + async function createCloudStorage(storageDetail) { + const { backendAPI } = config; - async function installedApps() { - const { backendAPI } = config; - try { - const response = await Axios.get(`${backendAPI}/server/plugins`, { - proxy: config.proxy, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + const storageDetailData = prepareData(storageDetail); + try { + const response = await Axios.post(`${backendAPI}/cloudstorages`, storageDetailData, { + proxy: config.proxy, + }); + return response.data; + } catch (errorData) { + throw generateError(errorData); } + } - async function createCloudStorage(storageDetail) { - const { backendAPI } = config; + async function updateCloudStorage(id, storageDetail) { + const { backendAPI } = config; - const storageDetailData = prepareData(storageDetail); - try { - const response = await Axios.post(`${backendAPI}/cloudstorages`, storageDetailData, { - proxy: config.proxy, - }); - return response.data; - } catch (errorData) { - throw generateError(errorData); - } + const storageDetailData = prepareData(storageDetail); + try { + await Axios.patch(`${backendAPI}/cloudstorages/${id}`, storageDetailData, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function updateCloudStorage(id, storageDetail) { - const { backendAPI } = config; + async function getCloudStorages(filter = {}) { + const { backendAPI } = config; - const storageDetailData = prepareData(storageDetail); - try { - await Axios.patch(`${backendAPI}/cloudstorages/${id}`, storageDetailData, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + let response = null; + try { + response = await Axios.get(`${backendAPI}/cloudstorages`, { + proxy: config.proxy, + params: filter, + page_size: 12, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getCloudStorages(filter = {}) { - const { backendAPI } = config; + response.data.results.count = response.data.count; + return response.data.results; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/cloudstorages`, { - proxy: config.proxy, - params: filter, - page_size: 12, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getCloudStorageContent(id, manifestPath) { + const { backendAPI } = config; - response.data.results.count = response.data.count; - return response.data.results; + let response = null; + try { + const url = `${backendAPI}/cloudstorages/${id}/content${ + manifestPath ? `?manifest_path=${manifestPath}` : '' + }`; + response = await Axios.get(url, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getCloudStorageContent(id, manifestPath) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - const url = `${backendAPI}/cloudstorages/${id}/content${ - manifestPath ? `?manifest_path=${manifestPath}` : '' - }`; - response = await Axios.get(url, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getCloudStoragePreview(id) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + const url = `${backendAPI}/cloudstorages/${id}/preview`; + response = await workerAxios.get(url, { + params: enableOrganization(), + proxy: config.proxy, + responseType: 'arraybuffer', + }); + } catch (errorData) { + throw generateError({ + message: '', + response: { + ...errorData.response, + data: String.fromCharCode.apply(null, new Uint8Array(errorData.response.data)), + }, + }); } - async function getCloudStoragePreview(id) { - const { backendAPI } = config; + return new Blob([new Uint8Array(response)]); + } - let response = null; - try { - const url = `${backendAPI}/cloudstorages/${id}/preview`; - response = await workerAxios.get(url, { - params: enableOrganization(), - proxy: config.proxy, - responseType: 'arraybuffer', - }); - } catch (errorData) { - throw generateError({ - message: '', - response: { - ...errorData.response, - data: String.fromCharCode.apply(null, new Uint8Array(errorData.response.data)), - }, - }); - } + async function getCloudStorageStatus(id) { + const { backendAPI } = config; - return new Blob([new Uint8Array(response)]); + let response = null; + try { + const url = `${backendAPI}/cloudstorages/${id}/status`; + response = await Axios.get(url, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getCloudStorageStatus(id) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - const url = `${backendAPI}/cloudstorages/${id}/status`; - response = await Axios.get(url, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function deleteCloudStorage(id) { + const { backendAPI } = config; - return response.data; + try { + await Axios.delete(`${backendAPI}/cloudstorages/${id}`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function deleteCloudStorage(id) { - const { backendAPI } = config; + async function getOrganizations() { + const { backendAPI } = config; - try { - await Axios.delete(`${backendAPI}/cloudstorages/${id}`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + let response = null; + try { + response = await Axios.get(`${backendAPI}/organizations`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getOrganizations() { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/organizations`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function createOrganization(data) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.post(`${backendAPI}/organizations`, JSON.stringify(data), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function createOrganization(data) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.post(`${backendAPI}/organizations`, JSON.stringify(data), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function updateOrganization(id, data) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.patch(`${backendAPI}/organizations/${id}`, JSON.stringify(data), { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function updateOrganization(id, data) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.patch(`${backendAPI}/organizations/${id}`, JSON.stringify(data), { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function deleteOrganization(id) { + const { backendAPI } = config; - return response.data; + try { + await Axios.delete(`${backendAPI}/organizations/${id}`, { + proxy: config.proxy, + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function deleteOrganization(id) { - const { backendAPI } = config; - - try { - await Axios.delete(`${backendAPI}/organizations/${id}`, { - proxy: config.proxy, - headers: { - 'Content-Type': 'application/json', - }, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getOrganizationMembers(orgSlug, page, pageSize, filters = {}) { + const { backendAPI } = config; + + let response = null; + try { + response = await Axios.get(`${backendAPI}/memberships`, { + proxy: config.proxy, + params: { + ...filters, + org: orgSlug, + page, + page_size: pageSize, + }, + }); + } catch (errorData) { + throw generateError(errorData); } - async function getOrganizationMembers(orgSlug, page, pageSize, filters = {}) { - const { backendAPI } = config; + return response.data; + } - let response = null; - try { - response = await Axios.get(`${backendAPI}/memberships`, { + async function inviteOrganizationMembers(orgId, data) { + const { backendAPI } = config; + try { + await Axios.post( + `${backendAPI}/invitations`, + { + ...data, + organization: orgId, + }, + { proxy: config.proxy, - params: { - ...filters, - org: orgSlug, - page, - page_size: pageSize, - }, - }); - } catch (errorData) { - throw generateError(errorData); - } - - return response.data; + }, + ); + } catch (errorData) { + throw generateError(errorData); } + } - async function inviteOrganizationMembers(orgId, data) { - const { backendAPI } = config; - try { - await Axios.post( - `${backendAPI}/invitations`, - { - ...data, - organization: orgId, - }, - { - proxy: config.proxy, - }, - ); - } catch (errorData) { - throw generateError(errorData); - } + async function updateOrganizationMembership(membershipId, data) { + const { backendAPI } = config; + let response = null; + try { + response = await Axios.patch( + `${backendAPI}/memberships/${membershipId}`, + { + ...data, + }, + { + proxy: config.proxy, + }, + ); + } catch (errorData) { + throw generateError(errorData); } - async function updateOrganizationMembership(membershipId, data) { - const { backendAPI } = config; - let response = null; - try { - response = await Axios.patch( - `${backendAPI}/memberships/${membershipId}`, - { - ...data, - }, - { - proxy: config.proxy, - }, - ); - } catch (errorData) { - throw generateError(errorData); - } - - return response.data; - } + return response.data; + } - async function deleteOrganizationMembership(membershipId) { - const { backendAPI } = config; + async function deleteOrganizationMembership(membershipId) { + const { backendAPI } = config; - try { - await Axios.delete(`${backendAPI}/memberships/${membershipId}`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + try { + await Axios.delete(`${backendAPI}/memberships/${membershipId}`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } + } - async function getMembershipInvitation(id) { - const { backendAPI } = config; - - let response = null; - try { - response = await Axios.get(`${backendAPI}/invitations/${id}`, { - proxy: config.proxy, - }); - } catch (errorData) { - throw generateError(errorData); - } + async function getMembershipInvitation(id) { + const { backendAPI } = config; - return response.data; + let response = null; + try { + response = await Axios.get(`${backendAPI}/invitations/${id}`, { + proxy: config.proxy, + }); + } catch (errorData) { + throw generateError(errorData); } - Object.defineProperties( - this, - Object.freeze({ - server: { - value: Object.freeze({ - about, - share, - formats, - exception, - login, - logout, - changePassword, - requestPasswordReset, - resetPassword, - authorized, - register, - request: serverRequest, - userAgreements, - installedApps, - }), - writable: false, - }, + return response.data; + } - projects: { - value: Object.freeze({ - get: getProjects, - searchNames: searchProjectNames, - save: saveProject, - create: createProject, - delete: deleteProject, - exportDataset: exportDataset('projects'), - export: exportProject, - import: importProject, - importDataset, - }), - writable: false, - }, + Object.defineProperties( + this, + Object.freeze({ + server: { + value: Object.freeze({ + about, + share, + formats, + exception, + login, + logout, + changePassword, + requestPasswordReset, + resetPassword, + authorized, + register, + request: serverRequest, + userAgreements, + installedApps, + }), + writable: false, + }, - tasks: { - value: Object.freeze({ - get: getTasks, - save: saveTask, - create: createTask, - delete: deleteTask, - exportDataset: exportDataset('tasks'), - export: exportTask, - import: importTask, - }), - writable: false, - }, + projects: { + value: Object.freeze({ + get: getProjects, + searchNames: searchProjectNames, + save: saveProject, + create: createProject, + delete: deleteProject, + exportDataset: exportDataset('projects'), + export: exportProject, + import: importProject, + importDataset, + }), + writable: false, + }, - jobs: { - value: Object.freeze({ - get: getJobs, - save: saveJob, - exportDataset: exportDataset('jobs'), - }), - writable: false, - }, + tasks: { + value: Object.freeze({ + get: getTasks, + save: saveTask, + create: createTask, + delete: deleteTask, + exportDataset: exportDataset('tasks'), + export: exportTask, + import: importTask, + }), + writable: false, + }, - users: { - value: Object.freeze({ - get: getUsers, - self: getSelf, - }), - writable: false, - }, + jobs: { + value: Object.freeze({ + get: getJobs, + save: saveJob, + exportDataset: exportDataset('jobs'), + }), + writable: false, + }, - frames: { - value: Object.freeze({ - getData, - getMeta, - saveMeta, - getPreview, - getImageContext, - }), - writable: false, - }, + users: { + value: Object.freeze({ + get: getUsers, + self: getSelf, + }), + writable: false, + }, - annotations: { - value: Object.freeze({ - updateAnnotations, - getAnnotations, - dumpAnnotations, - uploadAnnotations, - }), - writable: false, - }, + frames: { + value: Object.freeze({ + getData, + getMeta, + saveMeta, + getPreview, + getImageContext, + }), + writable: false, + }, - logs: { - value: Object.freeze({ - save: saveLogs, - }), - writable: false, - }, + annotations: { + value: Object.freeze({ + updateAnnotations, + getAnnotations, + dumpAnnotations, + uploadAnnotations, + }), + writable: false, + }, - lambda: { - value: Object.freeze({ - list: getLambdaFunctions, - status: getRequestStatus, - requests: getLambdaRequests, - run: runLambdaRequest, - call: callLambdaFunction, - cancel: cancelLambdaRequest, - }), - writable: false, - }, + logs: { + value: Object.freeze({ + save: saveLogs, + }), + writable: false, + }, - issues: { - value: Object.freeze({ - create: createIssue, - update: updateIssue, - get: getJobIssues, - delete: deleteIssue, - }), - writable: false, - }, + lambda: { + value: Object.freeze({ + list: getLambdaFunctions, + status: getRequestStatus, + requests: getLambdaRequests, + run: runLambdaRequest, + call: callLambdaFunction, + cancel: cancelLambdaRequest, + }), + writable: false, + }, - comments: { - value: Object.freeze({ - create: createComment, - }), - writable: false, - }, + issues: { + value: Object.freeze({ + create: createIssue, + update: updateIssue, + get: getJobIssues, + delete: deleteIssue, + }), + writable: false, + }, - predictor: { - value: Object.freeze({ - status: predictorStatus, - predict: predictAnnotations, - }), - writable: false, - }, + comments: { + value: Object.freeze({ + create: createComment, + }), + writable: false, + }, - cloudStorages: { - value: Object.freeze({ - get: getCloudStorages, - getContent: getCloudStorageContent, - getPreview: getCloudStoragePreview, - getStatus: getCloudStorageStatus, - create: createCloudStorage, - delete: deleteCloudStorage, - update: updateCloudStorage, - }), - writable: false, - }, + predictor: { + value: Object.freeze({ + status: predictorStatus, + predict: predictAnnotations, + }), + writable: false, + }, - organizations: { - value: Object.freeze({ - get: getOrganizations, - create: createOrganization, - update: updateOrganization, - members: getOrganizationMembers, - invitation: getMembershipInvitation, - delete: deleteOrganization, - invite: inviteOrganizationMembers, - updateMembership: updateOrganizationMembership, - deleteMembership: deleteOrganizationMembership, - }), - writable: false, - }, - }), - ); - } + cloudStorages: { + value: Object.freeze({ + get: getCloudStorages, + getContent: getCloudStorageContent, + getPreview: getCloudStoragePreview, + getStatus: getCloudStorageStatus, + create: createCloudStorage, + delete: deleteCloudStorage, + update: updateCloudStorage, + }), + writable: false, + }, + + organizations: { + value: Object.freeze({ + get: getOrganizations, + create: createOrganization, + update: updateOrganization, + members: getOrganizationMembers, + invitation: getMembershipInvitation, + delete: deleteOrganization, + invite: inviteOrganizationMembers, + updateMembership: updateOrganizationMembership, + deleteMembership: deleteOrganizationMembership, + }), + writable: false, + }, + }), + ); } +} - const serverProxy = new ServerProxy(); - module.exports = serverProxy; -})(); +const serverProxy = new ServerProxy(); +export default serverProxy; diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 1f9ad449bf4..9ee019925c9 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -3,2744 +3,2744 @@ // // SPDX-License-Identifier: MIT -(() => { - const PluginRegistry = require('./plugins').default; - const loggerStorage = require('./logger-storage'); - const serverProxy = require('./server-proxy'); - const { - getFrame, - deleteFrame, - restoreFrame, - getRanges, - getPreview, - clear: clearFrames, - findNotDeletedFrame, - getContextImage, - patchMeta, - getDeletedFrames, - } = require('./frames'); - const { ArgumentError, DataError } = require('./exceptions'); - const { - JobStage, JobState, HistoryActions, - } = require('./enums'); - const { Label } = require('./labels'); - const User = require('./user'); - const Issue = require('./issue'); - const { FieldUpdateTrigger, checkObjectType } = require('./common'); - - function buildDuplicatedAPI(prototype) { - Object.defineProperties(prototype, { - annotations: Object.freeze({ - value: { - async upload(format: string, useDefaultLocation: boolean, sourceStorage: Storage, file: File | string) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.upload, - format, - useDefaultLocation, - sourceStorage, - file, - ); - return result; - }, +import { Storage } from './interfaces'; + +const PluginRegistry = require('./plugins').default; +const loggerStorage = require('./logger-storage'); +const serverProxy = require('./server-proxy').default; +const { + getFrame, + deleteFrame, + restoreFrame, + getRanges, + getPreview, + clear: clearFrames, + findNotDeletedFrame, + getContextImage, + patchMeta, + getDeletedFrames, +} = require('./frames'); +const { ArgumentError, DataError } = require('./exceptions'); +const { + JobStage, JobState, HistoryActions, +} = require('./enums'); +const { Label } = require('./labels'); +const User = require('./user'); +const Issue = require('./issue'); +const { FieldUpdateTrigger, checkObjectType } = require('./common'); + +function buildDuplicatedAPI(prototype) { + Object.defineProperties(prototype, { + annotations: Object.freeze({ + value: { + async upload(format: string, useDefaultLocation: boolean, sourceStorage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.upload, + format, + useDefaultLocation, + sourceStorage, + file, + ); + return result; + }, - async save(onUpdate) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.save, onUpdate); - return result; - }, + async save(onUpdate) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.save, onUpdate); + return result; + }, - async clear( - reload = false, startframe = undefined, endframe = undefined, delTrackKeyframesOnly = true, - ) { - const result = await PluginRegistry.apiWrapper.call( - this, prototype.annotations.clear, reload, startframe, endframe, delTrackKeyframesOnly, - ); - return result; - }, + async clear( + reload = false, startframe = undefined, endframe = undefined, delTrackKeyframesOnly = true, + ) { + const result = await PluginRegistry.apiWrapper.call( + this, prototype.annotations.clear, reload, startframe, endframe, delTrackKeyframesOnly, + ); + return result; + }, - async statistics() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.statistics); - return result; - }, + async statistics() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.statistics); + return result; + }, - async put(arrayOfObjects = []) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.put, - arrayOfObjects, - ); - return result; - }, + async put(arrayOfObjects = []) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.put, + arrayOfObjects, + ); + return result; + }, - async get(frame, allTracks = false, filters = []) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.get, - frame, - allTracks, - filters, - ); - return result; - }, + async get(frame, allTracks = false, filters = []) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.get, + frame, + allTracks, + filters, + ); + return result; + }, - async search(filters, frameFrom, frameTo) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.search, - filters, - frameFrom, - frameTo, - ); - return result; - }, + async search(filters, frameFrom, frameTo) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.search, + filters, + frameFrom, + frameTo, + ); + return result; + }, - async searchEmpty(frameFrom, frameTo) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.searchEmpty, - frameFrom, - frameTo, - ); - return result; - }, + async searchEmpty(frameFrom, frameTo) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.searchEmpty, + frameFrom, + frameTo, + ); + return result; + }, - async select(objectStates, x, y) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.select, - objectStates, - x, - y, - ); - return result; - }, + async select(objectStates, x, y) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.select, + objectStates, + x, + y, + ); + return result; + }, - async merge(objectStates) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.merge, - objectStates, - ); - return result; - }, + async merge(objectStates) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.merge, + objectStates, + ); + return result; + }, - async split(objectState, frame) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.split, - objectState, - frame, - ); - return result; - }, + async split(objectState, frame) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.split, + objectState, + frame, + ); + return result; + }, - async group(objectStates, reset = false) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.group, - objectStates, - reset, - ); - return result; - }, + async group(objectStates, reset = false) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.group, + objectStates, + reset, + ); + return result; + }, - async import(data) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.import, data); - return result; - }, + async import(data) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.import, data); + return result; + }, - async export() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.export); - return result; - }, + async export() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.annotations.export); + return result; + }, - async exportDataset( - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - customName?: string - ) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.annotations.exportDataset, - format, - saveImages, - useDefaultSettings, - targetStorage, - customName - ); - return result; - }, + async exportDataset( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string + ) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.annotations.exportDataset, + format, + saveImages, + useDefaultSettings, + targetStorage, + customName + ); + return result; + }, - hasUnsavedChanges() { - const result = prototype.annotations.hasUnsavedChanges.implementation.call(this); - return result; - }, + hasUnsavedChanges() { + const result = prototype.annotations.hasUnsavedChanges.implementation.call(this); + return result; }, - writable: true, - }), - frames: Object.freeze({ - value: { - async get(frame, isPlaying = false, step = 1) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.frames.get, - frame, - isPlaying, - step, - ); - return result; - }, - async delete(frame) { - await PluginRegistry.apiWrapper.call( - this, - prototype.frames.delete, - frame, - ); - }, - async restore(frame) { - await PluginRegistry.apiWrapper.call( - this, - prototype.frames.restore, - frame, - ); - }, - async save() { - await PluginRegistry.apiWrapper.call( - this, - prototype.frames.save, - ); - }, - async ranges() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.frames.ranges); - return result; - }, - async preview() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.frames.preview); - return result; - }, - async search(filters, frameFrom, frameTo) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.frames.search, - filters, - frameFrom, - frameTo, - ); - return result; - }, - async contextImage(frameId) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.frames.contextImage, - frameId, - ); - return result; - }, + }, + writable: true, + }), + frames: Object.freeze({ + value: { + async get(frame, isPlaying = false, step = 1) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.frames.get, + frame, + isPlaying, + step, + ); + return result; }, - writable: true, - }), - logger: Object.freeze({ - value: { - async log(logType, payload = {}, wait = false) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.logger.log, - logType, - payload, - wait, - ); - return result; - }, + async delete(frame) { + await PluginRegistry.apiWrapper.call( + this, + prototype.frames.delete, + frame, + ); }, - writable: true, - }), - actions: Object.freeze({ - value: { - async undo(count = 1) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.undo, count); - return result; - }, - async redo(count = 1) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.redo, count); - return result; - }, - async freeze(frozen) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.freeze, frozen); - return result; - }, - async clear() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.clear); - return result; - }, - async get() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.get); - return result; - }, + async restore(frame) { + await PluginRegistry.apiWrapper.call( + this, + prototype.frames.restore, + frame, + ); }, - writable: true, - }), - events: Object.freeze({ - value: { - async subscribe(evType, callback) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.events.subscribe, - evType, - callback, - ); - return result; - }, - async unsubscribe(evType, callback = null) { - const result = await PluginRegistry.apiWrapper.call( - this, - prototype.events.unsubscribe, - evType, - callback, - ); - return result; - }, + async save() { + await PluginRegistry.apiWrapper.call( + this, + prototype.frames.save, + ); }, - writable: true, - }), - predictor: Object.freeze({ - value: { - async status() { - const result = await PluginRegistry.apiWrapper.call(this, prototype.predictor.status); - return result; - }, - async predict(frame) { - const result = await PluginRegistry.apiWrapper.call(this, prototype.predictor.predict, frame); - return result; - }, + async ranges() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.frames.ranges); + return result; }, - writable: true, - }), - }); - } - - /** - * Base abstract class for Task and Job. It contains common members. - * @hideconstructor - * @virtual - */ - class Session { - constructor() { - /** - * An interaction with annotations - * @namespace annotations - * @memberof Session - */ - /** - * Upload annotations from a dump file - * You need upload annotations from a server again after successful executing - * @method upload - * @memberof Session.annotations - * @param {File} annotations - a file with annotations - * @param {module:API.cvat.classes.Loader} loader - a loader - * which will be used to upload - * @instance - * @async - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - /** - * Save all changes in annotations on a server - * Objects which hadn't been saved on a server before, - * get a serverID after saving. But received object states aren't updated. - * So, after successful saving it's recommended to update them manually - * (call the annotations.get() again) - * @method save - * @memberof Session.annotations - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @instance - * @async - * @param {function} [onUpdate] saving can be long. - * This callback can be used to notify a user about current progress - * Its argument is a text string - */ - /** - * Remove all annotations and optionally reinitialize it - * @method clear - * @memberof Session.annotations - * @param {boolean} [reload = false] reset all changes and - * reinitialize annotations by data from a server - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.ServerError} - * @instance - * @async - */ - /** - * Collect short statistics about a task or a job. - * @method statistics - * @memberof Session.annotations - * @returns {module:API.cvat.classes.Statistics} statistics object - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Create new objects from one-frame states - * After successful adding you need to update object states on a frame - * @method put - * @memberof Session.annotations - * @param {module:API.cvat.classes.ObjectState[]} data - * @returns {number[]} identificators of added objects - * array of objects on the specific frame - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.DataError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Get annotations for a specific frame - *
    Filter supports following operators: - * ==, !=, >, >=, <, <=, ~= and (), |, & for grouping. - *
    Filter supports properties: - * width, height, label, serverID, clientID, type, shape, occluded - *
    All prop values are case-sensitive. CVAT uses json queries for search. - *
    Examples: - *
      - *
    • label=="car" | label==["road sign"]
      • - *
    • width >= height
      • - *
    • attr["Attribute 1"] == attr["Attribute 2"]
      • - *
    • type=="track" & shape="rectangle"
      • - *
    • clientID == 50
      • - *
    • (label=="car" & attr["parked"]==true) - * | (label=="pedestrian" & width > 150)
      • - *
    • (( label==["car \"mazda\""]) & - * (attr["sunglass ( help ) es"]==true | - * (width > 150 | height > 150 & (clientID == serverID)))))
      • - *
    - * If you have double quotes in your query string, - * please escape them using back slash: \" - * @method get - * @param {number} frame get objects from the frame - * @param {boolean} allTracks show all tracks - * even if they are outside and not keyframe - * @param {any[]} [filters = []] - * get only objects that satisfied to specific filters - * @returns {module:API.cvat.classes.ObjectState[]} - * @memberof Session.annotations - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Find a frame in the range [from, to] - * that contains at least one object satisfied to a filter - * @method search - * @memberof Session.annotations - * @param {ObjectFilter} [filter = []] filter - * @param {number} from lower bound of a search - * @param {number} to upper bound of a search - * @returns {number|null} a frame that contains objects according to the filter - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Find the nearest empty frame without any annotations - * @method searchEmpty - * @memberof Session.annotations - * @param {number} from lower bound of a search - * @param {number} to upper bound of a search - * @returns {number|null} a empty frame according boundaries - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Select shape under a cursor by using minimal distance - * between a cursor and a shape edge or a shape point - * For closed shapes a cursor is placed inside a shape - * @method select - * @memberof Session.annotations - * @param {module:API.cvat.classes.ObjectState[]} objectStates - * objects which can be selected - * @param {float} x horizontal coordinate - * @param {float} y vertical coordinate - * @returns {Object} - * a pair of {state: ObjectState, distance: number} for selected object. - * Pair values can be null if there aren't any sutisfied objects - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Method unites several shapes and tracks into the one - * All shapes must be the same (rectangle, polygon, etc) - * All labels must be the same - * After successful merge you need to update object states on a frame - * @method merge - * @memberof Session.annotations - * @param {module:API.cvat.classes.ObjectState[]} objectStates - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Method splits a track into two parts - * (start frame: previous frame), (frame, last frame) - * After successful split you need to update object states on a frame - * @method split - * @memberof Session.annotations - * @param {module:API.cvat.classes.ObjectState} objectState - * @param {number} frame - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Method creates a new group and put all passed objects into it - * After successful split you need to update object states on a frame - * @method group - * @memberof Session.annotations - * @param {module:API.cvat.classes.ObjectState[]} objectStates - * @param {boolean} reset pass "true" to reset group value (set it to 0) - * @returns {number} an ID of created group - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Method indicates if there are any changes in - * annotations which haven't been saved on a server - *
    This function cannot be wrapped with a plugin - * @method hasUnsavedChanges - * @memberof Session.annotations - * @returns {boolean} - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - */ - /** - * - * Import raw data in a collection - * @method import - * @memberof Session.annotations - * @param {Object} data - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * - * Export a collection as a row data - * @method export - * @memberof Session.annotations - * @returns {Object} data - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Export as a dataset. - * Method builds a dataset in the specified format. - * @method exportDataset - * @memberof Session.annotations - * @param {module:String} format - a format - * @returns {string} An URL to the dataset file - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Namespace is used for an interaction with frames - * @namespace frames - * @memberof Session - */ - /** - * Get frame by its number - * @method get - * @memberof Session.frames - * @param {number} frame number of frame which you want to get - * @returns {module:API.cvat.classes.FrameData} - * @instance - * @async - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.DataError} - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - /** - * @typedef {Object} FrameSearchFilters - * @property {boolean} notDeleted if true will search for non-deleted frames - * @property {number} offset defines frame step during search - /** - * Find frame that match the condition - * @method search - * @memberof Session.frames - * @param {FrameSearchFilters} filters filters to search frame for - * @param {number} from lower bound of a search - * @param {number} to upper bound of a search - * @returns {number|null} a non-deleted frame according boundaries - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Delete frame from the job - * @method delete - * @memberof Session.frames - * @param {number} frame number of frame which you want to delete - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Restore frame from the job - * @method delete - * @memberof Session.frames - * @param {number} frame number of frame which you want to restore - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Save any changes in frames if some of them were deleted/restored - * @method save - * @memberof Session.frames - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Get the first frame of a task for preview - * @method preview - * @memberof Session.frames - * @returns {string} - jpeg encoded image - * @instance - * @async - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - /** - * Returns the ranges of cached frames - * @method ranges - * @memberof Session.frames - * @returns {Array.} - * @instance - * @async - */ - /** - * Namespace is used for an interaction with logs - * @namespace logger - * @memberof Session - */ - /** - * Create a log and add it to a log collection
    - * Durable logs will be added after "close" method is called for them
    - * The fields "task_id" and "job_id" automatically added when add logs - * through a task or a job
    - * Ignore rules exist for some logs (e.g. zoomImage, changeAttribute)
    - * Payload of ignored logs are shallowly combined to previous logs of the same type - * @method log - * @memberof Session.logger - * @param {module:API.cvat.enums.LogType | string} type - log type - * @param {Object} [payload = {}] - any other data that will be appended to the log - * @param {boolean} [wait = false] - specifies if log is durable - * @returns {module:API.cvat.classes.Log} - * @instance - * @async - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - /** - * Namespace is used for an interaction with actions - * @namespace actions - * @memberof Session - */ - /** - * @typedef {Object} HistoryActions - * @property {string[]} [undo] - array of possible actions to undo - * @property {string[]} [redo] - array of possible actions to redo - * @global - */ - /** - * Make undo - * @method undo - * @memberof Session.actions - * @param {number} [count=1] number of actions to undo - * @returns {number[]} Array of affected objects - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Make redo - * @method redo - * @memberof Session.actions - * @param {number} [count=1] number of actions to redo - * @returns {number[]} Array of affected objects - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Freeze history (do not save new actions) - * @method freeze - * @memberof Session.actions - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Remove all actions from history - * @method clear - * @memberof Session.actions - * @throws {module:API.cvat.exceptions.PluginError} - * @instance - * @async - */ - /** - * Get actions - * @method get - * @memberof Session.actions - * @returns {HistoryActions} - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @returns {Array.>} - * array of pairs [action name, frame number] - * @instance - * @async - */ - /** - * Namespace is used for an interaction with events - * @namespace events - * @memberof Session - */ - /** - * Subscribe on an event - * @method subscribe - * @memberof Session.events - * @param {module:API.cvat.enums.EventType} type - event type - * @param {functions} callback - function which will be called on event - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * Unsubscribe from an event. If callback is not provided, - * all callbacks will be removed from subscribers for the event - * @method unsubscribe - * @memberof Session.events - * @param {module:API.cvat.enums.EventType} type - event type - * @param {functions} [callback = null] - function which is called on event - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @instance - * @async - */ - /** - * @typedef {Object} PredictorStatus - * @property {string} message - message for a user to be displayed somewhere - * @property {number} projectScore - model accuracy - * @global - */ - /** - * Namespace is used for an interaction with events - * @namespace predictor - * @memberof Session - */ - /** - * Subscribe to updates of a ML model binded to the project - * @method status - * @memberof Session.predictor - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ServerError} - * @returns {PredictorStatus} - * @instance - * @async - */ - /** - * Get predictions from a ML model binded to the project - * @method predict - * @memberof Session.predictor - * @param {number} frame - number of frame to inference - * @throws {module:API.cvat.exceptions.PluginError} - * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.DataError} - * @returns {object[] | null} annotations - * @instance - * @async - */ - } - } - - /** - * Class representing a job. - * @memberof module:API.cvat.classes - * @hideconstructor - * @extends Session - */ - class Job extends Session { - constructor(initialData) { - super(); - const data = { - id: undefined, - assignee: null, - stage: undefined, - state: undefined, - start_frame: undefined, - stop_frame: undefined, - project_id: null, - task_id: undefined, - labels: undefined, - dimension: undefined, - data_compressed_chunk_type: undefined, - data_chunk_size: undefined, - bug_tracker: null, - mode: undefined, - }; - - const updateTrigger = new FieldUpdateTrigger(); - - for (const property in data) { - if (Object.prototype.hasOwnProperty.call(data, property)) { - if (property in initialData) { - data[property] = initialData[property]; - } - - if (data[property] === undefined) { - throw new ArgumentError(`Job field "${property}" was not initialized`); - } - } - } - - if (data.assignee) data.assignee = new User(data.assignee); - if (Array.isArray(initialData.labels)) { - data.labels = initialData.labels.map((labelData) => { - // can be already wrapped to the class - // when create this job from Task constructor - if (labelData instanceof Label) { - return labelData; - } - - return new Label(labelData); - }).filter((label) => !label.hasParent); - } else { - throw new Error('Job labels must be an array'); - } - - Object.defineProperties( - this, - Object.freeze({ - /** - * @name id - * @type {number} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - id: { - get: () => data.id, - }, - /** - * Instance of a user who is responsible for the job annotations - * @name assignee - * @type {module:API.cvat.classes.User} - * @memberof module:API.cvat.classes.Job - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - assignee: { - get: () => data.assignee, - set: (assignee) => { - if (assignee !== null && !(assignee instanceof User)) { - throw new ArgumentError('Value must be a user instance'); - } - updateTrigger.update('assignee'); - data.assignee = assignee; - }, - }, - /** - * @name stage - * @type {module:API.cvat.enums.JobStage} - * @memberof module:API.cvat.classes.Job - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - stage: { - get: () => data.stage, - set: (stage) => { - const type = JobStage; - let valueInEnum = false; - for (const value in type) { - if (type[value] === stage) { - valueInEnum = true; - break; - } - } - - if (!valueInEnum) { - throw new ArgumentError( - 'Value must be a value from the enumeration cvat.enums.JobStage', - ); - } - - updateTrigger.update('stage'); - data.stage = stage; - }, - }, - /** - * @name state - * @type {module:API.cvat.enums.JobState} - * @memberof module:API.cvat.classes.Job - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - state: { - get: () => data.state, - set: (state) => { - const type = JobState; - let valueInEnum = false; - for (const value in type) { - if (type[value] === state) { - valueInEnum = true; - break; - } - } - - if (!valueInEnum) { - throw new ArgumentError( - 'Value must be a value from the enumeration cvat.enums.JobState', - ); - } - - updateTrigger.update('state'); - data.state = state; - }, - }, - /** - * @name startFrame - * @type {number} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - startFrame: { - get: () => data.start_frame, - }, - /** - * @name stopFrame - * @type {number} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - stopFrame: { - get: () => data.stop_frame, - }, - /** - * @name projectId - * @type {number|null} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - projectId: { - get: () => data.project_id, - }, - /** - * @name taskId - * @type {number} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - taskId: { - get: () => data.task_id, - }, - /** - * @name labels - * @type {module:API.cvat.classes.Label[]} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - labels: { - get: () => data.labels.filter((_label) => !_label.deleted), - }, - /** - * @name dimension - * @type {module:API.cvat.enums.DimensionType} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - dimension: { - get: () => data.dimension, - }, - /** - * @name dataChunkSize - * @type {number} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - dataChunkSize: { - get: () => data.data_chunk_size, - set: (chunkSize) => { - if (typeof chunkSize !== 'number' || chunkSize < 1) { - throw new ArgumentError( - `Chunk size value must be a positive number. But value ${chunkSize} has been got.`, - ); - } - - data.data_chunk_size = chunkSize; - }, - }, - /** - * @name dataChunkSize - * @type {string} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - dataChunkType: { - get: () => data.data_compressed_chunk_type, - }, - /** - * @name mode - * @type {string} - * @memberof module:API.cvat.classes.Job - * @readonly - * @instance - */ - mode: { - get: () => data.mode, - }, - /** - * @name bugTracker - * @type {string|null} - * @memberof module:API.cvat.classes.Job - * @instance - * @readonly - */ - bugTracker: { - get: () => data.bug_tracker, - }, - _updateTrigger: { - get: () => updateTrigger, - }, - }), - ); - - // When we call a function, for example: task.annotations.get() - // In the method get we lose the task context - // So, we need return it - this.annotations = { - get: Object.getPrototypeOf(this).annotations.get.bind(this), - put: Object.getPrototypeOf(this).annotations.put.bind(this), - save: Object.getPrototypeOf(this).annotations.save.bind(this), - merge: Object.getPrototypeOf(this).annotations.merge.bind(this), - split: Object.getPrototypeOf(this).annotations.split.bind(this), - group: Object.getPrototypeOf(this).annotations.group.bind(this), - clear: Object.getPrototypeOf(this).annotations.clear.bind(this), - search: Object.getPrototypeOf(this).annotations.search.bind(this), - searchEmpty: Object.getPrototypeOf(this).annotations.searchEmpty.bind(this), - upload: Object.getPrototypeOf(this).annotations.upload.bind(this), - select: Object.getPrototypeOf(this).annotations.select.bind(this), - import: Object.getPrototypeOf(this).annotations.import.bind(this), - export: Object.getPrototypeOf(this).annotations.export.bind(this), - statistics: Object.getPrototypeOf(this).annotations.statistics.bind(this), - hasUnsavedChanges: Object.getPrototypeOf(this).annotations.hasUnsavedChanges.bind(this), - exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), - }; - - this.actions = { - undo: Object.getPrototypeOf(this).actions.undo.bind(this), - redo: Object.getPrototypeOf(this).actions.redo.bind(this), - freeze: Object.getPrototypeOf(this).actions.freeze.bind(this), - clear: Object.getPrototypeOf(this).actions.clear.bind(this), - get: Object.getPrototypeOf(this).actions.get.bind(this), - }; - - this.frames = { - get: Object.getPrototypeOf(this).frames.get.bind(this), - delete: Object.getPrototypeOf(this).frames.delete.bind(this), - restore: Object.getPrototypeOf(this).frames.restore.bind(this), - save: Object.getPrototypeOf(this).frames.save.bind(this), - ranges: Object.getPrototypeOf(this).frames.ranges.bind(this), - preview: Object.getPrototypeOf(this).frames.preview.bind(this), - search: Object.getPrototypeOf(this).frames.search.bind(this), - contextImage: Object.getPrototypeOf(this).frames.contextImage.bind(this), - }; - - this.logger = { - log: Object.getPrototypeOf(this).logger.log.bind(this), - }; - - this.predictor = { - status: Object.getPrototypeOf(this).predictor.status.bind(this), - predict: Object.getPrototypeOf(this).predictor.predict.bind(this), - }; - } - + async preview() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.frames.preview); + return result; + }, + async search(filters, frameFrom, frameTo) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.frames.search, + filters, + frameFrom, + frameTo, + ); + return result; + }, + async contextImage(frameId) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.frames.contextImage, + frameId, + ); + return result; + }, + }, + writable: true, + }), + logger: Object.freeze({ + value: { + async log(logType, payload = {}, wait = false) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.logger.log, + logType, + payload, + wait, + ); + return result; + }, + }, + writable: true, + }), + actions: Object.freeze({ + value: { + async undo(count = 1) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.undo, count); + return result; + }, + async redo(count = 1) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.redo, count); + return result; + }, + async freeze(frozen) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.freeze, frozen); + return result; + }, + async clear() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.clear); + return result; + }, + async get() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.actions.get); + return result; + }, + }, + writable: true, + }), + events: Object.freeze({ + value: { + async subscribe(evType, callback) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.events.subscribe, + evType, + callback, + ); + return result; + }, + async unsubscribe(evType, callback = null) { + const result = await PluginRegistry.apiWrapper.call( + this, + prototype.events.unsubscribe, + evType, + callback, + ); + return result; + }, + }, + writable: true, + }), + predictor: Object.freeze({ + value: { + async status() { + const result = await PluginRegistry.apiWrapper.call(this, prototype.predictor.status); + return result; + }, + async predict(frame) { + const result = await PluginRegistry.apiWrapper.call(this, prototype.predictor.predict, frame); + return result; + }, + }, + writable: true, + }), + }); +} + +/** + * Base abstract class for Task and Job. It contains common members. + * @hideconstructor + * @virtual + */ +class Session { + constructor() { + /** + * An interaction with annotations + * @namespace annotations + * @memberof Session + */ + /** + * Upload annotations from a dump file + * You need upload annotations from a server again after successful executing + * @method upload + * @memberof Session.annotations + * @param {File} annotations - a file with annotations + * @param {module:API.cvat.classes.Loader} loader - a loader + * which will be used to upload + * @instance + * @async + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.ArgumentError} + */ /** - * Method updates job data like state, stage or assignee + * Save all changes in annotations on a server + * Objects which hadn't been saved on a server before, + * get a serverID after saving. But received object states aren't updated. + * So, after successful saving it's recommended to update them manually + * (call the annotations.get() again) * @method save - * @memberof module:API.cvat.classes.Job - * @readonly + * @memberof Session.annotations + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} * @instance * @async + * @param {function} [onUpdate] saving can be long. + * This callback can be used to notify a user about current progress + * Its argument is a text string + */ + /** + * Remove all annotations and optionally reinitialize it + * @method clear + * @memberof Session.annotations + * @param {boolean} [reload = false] reset all changes and + * reinitialize annotations by data from a server + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} * @throws {module:API.cvat.exceptions.ServerError} + * @instance + * @async + */ + /** + * Collect short statistics about a task or a job. + * @method statistics + * @memberof Session.annotations + * @returns {module:API.cvat.classes.Statistics} statistics object * @throws {module:API.cvat.exceptions.PluginError} + * @instance + * @async */ - async save() { - const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.save); - return result; - } - /** - * Method returns a list of issues for a job - * @method issues - * @memberof module:API.cvat.classes.Job - * @returns {module:API.cvat.classes.Issue[]} - * @readonly + * Create new objects from one-frame states + * After successful adding you need to update object states on a frame + * @method put + * @memberof Session.annotations + * @param {module:API.cvat.classes.ObjectState[]} data + * @returns {number[]} identificators of added objects + * array of objects on the specific frame + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.DataError} + * @throws {module:API.cvat.exceptions.ArgumentError} * @instance * @async - * @throws {module:API.cvat.exceptions.ServerError} + */ + /** + * Get annotations for a specific frame + *
    Filter supports following operators: + * ==, !=, >, >=, <, <=, ~= and (), |, & for grouping. + *
    Filter supports properties: + * width, height, label, serverID, clientID, type, shape, occluded + *
    All prop values are case-sensitive. CVAT uses json queries for search. + *
    Examples: + *
      + *
    • label=="car" | label==["road sign"]
      • + *
    • width >= height
      • + *
    • attr["Attribute 1"] == attr["Attribute 2"]
      • + *
    • type=="track" & shape="rectangle"
      • + *
    • clientID == 50
      • + *
    • (label=="car" & attr["parked"]==true) + * | (label=="pedestrian" & width > 150)
      • + *
    • (( label==["car \"mazda\""]) & + * (attr["sunglass ( help ) es"]==true | + * (width > 150 | height > 150 & (clientID == serverID)))))
      • + *
    + * If you have double quotes in your query string, + * please escape them using back slash: \" + * @method get + * @param {number} frame get objects from the frame + * @param {boolean} allTracks show all tracks + * even if they are outside and not keyframe + * @param {any[]} [filters = []] + * get only objects that satisfied to specific filters + * @returns {module:API.cvat.classes.ObjectState[]} + * @memberof Session.annotations * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async */ - async issues() { - const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.issues); - return result; - } - /** - * Method adds a new issue to a job - * @method openIssue - * @memberof module:API.cvat.classes.Job - * @returns {module:API.cvat.classes.Issue} - * @param {module:API.cvat.classes.Issue} issue - * @param {string} message - * @readonly + * Find a frame in the range [from, to] + * that contains at least one object satisfied to a filter + * @method search + * @memberof Session.annotations + * @param {ObjectFilter} [filter = []] filter + * @param {number} from lower bound of a search + * @param {number} to upper bound of a search + * @returns {number|null} a frame that contains objects according to the filter + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} * @instance * @async + */ + /** + * Find the nearest empty frame without any annotations + * @method searchEmpty + * @memberof Session.annotations + * @param {number} from lower bound of a search + * @param {number} to upper bound of a search + * @returns {number|null} a empty frame according boundaries + * @throws {module:API.cvat.exceptions.PluginError} * @throws {module:API.cvat.exceptions.ArgumentError} - * @throws {module:API.cvat.exceptions.ServerError} + * @instance + * @async + */ + /** + * Select shape under a cursor by using minimal distance + * between a cursor and a shape edge or a shape point + * For closed shapes a cursor is placed inside a shape + * @method select + * @memberof Session.annotations + * @param {module:API.cvat.classes.ObjectState[]} objectStates + * objects which can be selected + * @param {float} x horizontal coordinate + * @param {float} y vertical coordinate + * @returns {Object} + * a pair of {state: ObjectState, distance: number} for selected object. + * Pair values can be null if there aren't any sutisfied objects * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async */ - async openIssue(issue, message) { - const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.openIssue, issue, message); - return result; - } - /** - * Method removes all job related data from the client (annotations, history, etc.) - * @method close - * @returns {module:API.cvat.classes.Job} - * @memberof module:API.cvat.classes.Job - * @readonly + * Method unites several shapes and tracks into the one + * All shapes must be the same (rectangle, polygon, etc) + * All labels must be the same + * After successful merge you need to update object states on a frame + * @method merge + * @memberof Session.annotations + * @param {module:API.cvat.classes.ObjectState[]} objectStates + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance * @async + */ + /** + * Method splits a track into two parts + * (start frame: previous frame), (frame, last frame) + * After successful split you need to update object states on a frame + * @method split + * @memberof Session.annotations + * @param {module:API.cvat.classes.ObjectState} objectState + * @param {number} frame + * @throws {module:API.cvat.exceptions.ArgumentError} + * @throws {module:API.cvat.exceptions.PluginError} * @instance + * @async + */ + /** + * Method creates a new group and put all passed objects into it + * After successful split you need to update object states on a frame + * @method group + * @memberof Session.annotations + * @param {module:API.cvat.classes.ObjectState[]} objectStates + * @param {boolean} reset pass "true" to reset group value (set it to 0) + * @returns {number} an ID of created group + * @throws {module:API.cvat.exceptions.ArgumentError} * @throws {module:API.cvat.exceptions.PluginError} + * @instance + * @async */ - async close() { - const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.close); - return result; - } - } - - /** - * Class representing a task - * @memberof module:API.cvat.classes - * @extends Session - */ - class Task extends Session { /** - * In a fact you need use the constructor only if you want to create a task - * @param {object} initialData - Object which is used for initialization - *
    It can contain keys: - *
  • name - *
  • assignee - *
  • bug_tracker - *
  • labels - *
  • segment_size - *
  • overlap + * Method indicates if there are any changes in + * annotations which haven't been saved on a server + *
    This function cannot be wrapped with a plugin + * @method hasUnsavedChanges + * @memberof Session.annotations + * @returns {boolean} + * @throws {module:API.cvat.exceptions.PluginError} + * @instance + */ + /** + * + * Import raw data in a collection + * @method import + * @memberof Session.annotations + * @param {Object} data + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async + */ + /** + * + * Export a collection as a row data + * @method export + * @memberof Session.annotations + * @returns {Object} data + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async + */ + /** + * Export as a dataset. + * Method builds a dataset in the specified format. + * @method exportDataset + * @memberof Session.annotations + * @param {module:String} format - a format + * @returns {string} An URL to the dataset file + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async + */ + /** + * Namespace is used for an interaction with frames + * @namespace frames + * @memberof Session + */ + /** + * Get frame by its number + * @method get + * @memberof Session.frames + * @param {number} frame number of frame which you want to get + * @returns {module:API.cvat.classes.FrameData} + * @instance + * @async + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.DataError} + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + /** + * @typedef {Object} FrameSearchFilters + * @property {boolean} notDeleted if true will search for non-deleted frames + * @property {number} offset defines frame step during search + /** + * Find frame that match the condition + * @method search + * @memberof Session.frames + * @param {FrameSearchFilters} filters filters to search frame for + * @param {number} from lower bound of a search + * @param {number} to upper bound of a search + * @returns {number|null} a non-deleted frame according boundaries + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async + */ + /** + * Delete frame from the job + * @method delete + * @memberof Session.frames + * @param {number} frame number of frame which you want to delete + * @throws {module:API.cvat.exceptions.ArgumentError} + * @throws {module:API.cvat.exceptions.PluginError} + * @instance + * @async + */ + /** + * Restore frame from the job + * @method delete + * @memberof Session.frames + * @param {number} frame number of frame which you want to restore + * @throws {module:API.cvat.exceptions.ArgumentError} + * @throws {module:API.cvat.exceptions.PluginError} + * @instance + * @async + */ + /** + * Save any changes in frames if some of them were deleted/restored + * @method save + * @memberof Session.frames + * @throws {module:API.cvat.exceptions.PluginError} + * @instance + * @async + */ + /** + * Get the first frame of a task for preview + * @method preview + * @memberof Session.frames + * @returns {string} - jpeg encoded image + * @instance + * @async + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + /** + * Returns the ranges of cached frames + * @method ranges + * @memberof Session.frames + * @returns {Array.} + * @instance + * @async + */ + /** + * Namespace is used for an interaction with logs + * @namespace logger + * @memberof Session */ - constructor(initialData) { - super(); - const data = { - id: undefined, - name: undefined, - project_id: null, - status: undefined, - size: undefined, - mode: undefined, - owner: null, - assignee: null, - created_date: undefined, - updated_date: undefined, - bug_tracker: undefined, - subset: undefined, - overlap: undefined, - segment_size: undefined, - image_quality: undefined, - start_frame: undefined, - stop_frame: undefined, - frame_filter: undefined, - data_chunk_size: undefined, - data_compressed_chunk_type: undefined, - data_original_chunk_type: undefined, - deleted_frames: undefined, - use_zip_chunks: undefined, - use_cache: undefined, - copy_data: undefined, - dimension: undefined, - cloud_storage_id: undefined, - sorting_method: undefined, - source_storage: undefined, - target_storage: undefined, - }; - - const updateTrigger = new FieldUpdateTrigger(); - - for (const property in data) { - if (Object.prototype.hasOwnProperty.call(data, property) && property in initialData) { - data[property] = initialData[property]; - } - } - - if (data.assignee) data.assignee = new User(data.assignee); - if (data.owner) data.owner = new User(data.owner); - - data.labels = []; - data.jobs = []; - data.files = Object.freeze({ - server_files: [], - client_files: [], - remote_files: [], - }); - - if (Array.isArray(initialData.labels)) { - data.labels = initialData.labels - .map((labelData) => new Label(labelData)).filter((label) => !label.hasParent); - } - - if (Array.isArray(initialData.segments)) { - for (const segment of initialData.segments) { - if (Array.isArray(segment.jobs)) { - for (const job of segment.jobs) { - const jobInstance = new Job({ - url: job.url, - id: job.id, - assignee: job.assignee, - state: job.state, - stage: job.stage, - start_frame: segment.start_frame, - stop_frame: segment.stop_frame, - // following fields also returned when doing API request /jobs/ - // here we know them from task and append to constructor - task_id: data.id, - project_id: data.project_id, - labels: data.labels, - bug_tracker: data.bug_tracker, - mode: data.mode, - dimension: data.dimension, - data_compressed_chunk_type: data.data_compressed_chunk_type, - data_chunk_size: data.data_chunk_size, - }); - - data.jobs.push(jobInstance); - } - } - } - } - - Object.defineProperties( - this, - Object.freeze({ - /** - * @name id - * @type {number} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - id: { - get: () => data.id, - }, - /** - * @name name - * @type {string} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - name: { - get: () => data.name, - set: (value) => { - if (!value.trim().length) { - throw new ArgumentError('Value must not be empty'); - } - updateTrigger.update('name'); - data.name = value; - }, - }, - /** - * @name projectId - * @type {number|null} - * @memberof module:API.cvat.classes.Task - * @instance - */ - projectId: { - get: () => data.project_id, - set: (projectId) => { - if (!Number.isInteger(projectId) || projectId <= 0) { - throw new ArgumentError('Value must be a positive integer'); - } - - updateTrigger.update('projectId'); - data.project_id = projectId; - }, - }, - /** - * @name status - * @type {module:API.cvat.enums.TaskStatus} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - status: { - get: () => data.status, - }, - /** - * @name size - * @type {number} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - size: { - get: () => data.size, - }, - /** - * @name mode - * @type {TaskMode} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - mode: { - get: () => data.mode, - }, - /** - * Instance of a user who has created the task - * @name owner - * @type {module:API.cvat.classes.User} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - owner: { - get: () => data.owner, - }, - /** - * Instance of a user who is responsible for the task - * @name assignee - * @type {module:API.cvat.classes.User} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - assignee: { - get: () => data.assignee, - set: (assignee) => { - if (assignee !== null && !(assignee instanceof User)) { - throw new ArgumentError('Value must be a user instance'); - } - updateTrigger.update('assignee'); - data.assignee = assignee; - }, - }, - /** - * @name createdDate - * @type {string} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - createdDate: { - get: () => data.created_date, - }, - /** - * @name updatedDate - * @type {string} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - updatedDate: { - get: () => data.updated_date, - }, - /** - * @name bugTracker - * @type {string} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - bugTracker: { - get: () => data.bug_tracker, - set: (tracker) => { - if (typeof tracker !== 'string') { - throw new ArgumentError( - `Subset value must be a string. But ${typeof tracker} has been got.`, - ); - } - - updateTrigger.update('bugTracker'); - data.bug_tracker = tracker; - }, - }, - /** - * @name subset - * @type {string} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exception.ArgumentError} - */ - subset: { - get: () => data.subset, - set: (subset) => { - if (typeof subset !== 'string') { - throw new ArgumentError( - `Subset value must be a string. But ${typeof subset} has been got.`, - ); - } - - updateTrigger.update('subset'); - data.subset = subset; - }, - }, - /** - * @name overlap - * @type {number} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - overlap: { - get: () => data.overlap, - set: (overlap) => { - if (!Number.isInteger(overlap) || overlap < 0) { - throw new ArgumentError('Value must be a non negative integer'); - } - data.overlap = overlap; - }, - }, - /** - * @name segmentSize - * @type {number} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - segmentSize: { - get: () => data.segment_size, - set: (segment) => { - if (!Number.isInteger(segment) || segment < 0) { - throw new ArgumentError('Value must be a positive integer'); - } - data.segment_size = segment; - }, - }, - /** - * @name imageQuality - * @type {number} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - imageQuality: { - get: () => data.image_quality, - set: (quality) => { - if (!Number.isInteger(quality) || quality < 0) { - throw new ArgumentError('Value must be a positive integer'); - } - data.image_quality = quality; - }, - }, - /** - * @name useZipChunks - * @type {boolean} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - useZipChunks: { - get: () => data.use_zip_chunks, - set: (useZipChunks) => { - if (typeof useZipChunks !== 'boolean') { - throw new ArgumentError('Value must be a boolean'); - } - data.use_zip_chunks = useZipChunks; - }, - }, - /** - * @name useCache - * @type {boolean} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - useCache: { - get: () => data.use_cache, - set: (useCache) => { - if (typeof useCache !== 'boolean') { - throw new ArgumentError('Value must be a boolean'); - } - 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; - }, - }, - /** - * @name labels - * @type {module:API.cvat.classes.Label[]} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - labels: { - get: () => data.labels.filter((_label) => !_label.deleted), - set: (labels) => { - if (!Array.isArray(labels)) { - throw new ArgumentError('Value must be an array of Labels'); - } - - for (const label of labels) { - if (!(label instanceof Label)) { - throw new ArgumentError( - `Each array value must be an instance of Label. ${typeof label} was found`, - ); - } - } - - const IDs = labels.map((_label) => _label.id); - const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id)); - deletedLabels.forEach((_label) => { - _label.deleted = true; - }); - - updateTrigger.update('labels'); - data.labels = [...deletedLabels, ...labels]; - }, - }, - /** - * @name jobs - * @type {module:API.cvat.classes.Job[]} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - jobs: { - get: () => [...data.jobs], - }, - /** - * List of files from shared resource or list of cloud storage files - * @name serverFiles - * @type {string[]} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - serverFiles: { - get: () => [...data.files.server_files], - set: (serverFiles) => { - if (!Array.isArray(serverFiles)) { - throw new ArgumentError( - `Value must be an array. But ${typeof serverFiles} has been got.`, - ); - } - - for (const value of serverFiles) { - if (typeof value !== 'string') { - throw new ArgumentError( - `Array values must be a string. But ${typeof value} has been got.`, - ); - } - } - - Array.prototype.push.apply(data.files.server_files, serverFiles); - }, - }, - /** - * List of files from client host - * @name clientFiles - * @type {File[]} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - clientFiles: { - get: () => [...data.files.client_files], - set: (clientFiles) => { - if (!Array.isArray(clientFiles)) { - throw new ArgumentError( - `Value must be an array. But ${typeof clientFiles} has been got.`, - ); - } - - for (const value of clientFiles) { - if (!(value instanceof File)) { - throw new ArgumentError( - `Array values must be a File. But ${value.constructor.name} has been got.`, - ); - } - } - - Array.prototype.push.apply(data.files.client_files, clientFiles); - }, - }, - /** - * List of files from remote host - * @name remoteFiles - * @type {File[]} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - remoteFiles: { - get: () => [...data.files.remote_files], - set: (remoteFiles) => { - if (!Array.isArray(remoteFiles)) { - throw new ArgumentError( - `Value must be an array. But ${typeof remoteFiles} has been got.`, - ); - } - - for (const value of remoteFiles) { - if (typeof value !== 'string') { - throw new ArgumentError( - `Array values must be a string. But ${typeof value} has been got.`, - ); - } - } - - Array.prototype.push.apply(data.files.remote_files, remoteFiles); - }, - }, - /** - * The first frame of a video to annotation - * @name startFrame - * @type {number} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - startFrame: { - get: () => data.start_frame, - set: (frame) => { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError('Value must be a not negative integer'); - } - data.start_frame = frame; - }, - }, - /** - * The last frame of a video to annotation - * @name stopFrame - * @type {number} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - stopFrame: { - get: () => data.stop_frame, - set: (frame) => { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError('Value must be a not negative integer'); - } - data.stop_frame = frame; - }, - }, - /** - * Filter to ignore some frames during task creation - * @name frameFilter - * @type {string} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - frameFilter: { - get: () => data.frame_filter, - set: (filter) => { - if (typeof filter !== 'string') { - throw new ArgumentError( - `Filter value must be a string. But ${typeof filter} has been got.`, - ); - } - - data.frame_filter = filter; - }, - }, - dataChunkSize: { - get: () => data.data_chunk_size, - set: (chunkSize) => { - if (typeof chunkSize !== 'number' || chunkSize < 1) { - throw new ArgumentError( - `Chunk size value must be a positive number. But value ${chunkSize} has been got.`, - ); - } - - data.data_chunk_size = chunkSize; - }, - }, - dataChunkType: { - get: () => data.data_compressed_chunk_type, - }, - /** - * @name dimension - * @type {module:API.cvat.enums.DimensionType} - * @memberof module:API.cvat.classes.Task - * @readonly - * @instance - */ - dimension: { - get: () => data.dimension, - }, - /** - * @name cloudStorageId - * @type {integer|null} - * @memberof module:API.cvat.classes.Task - * @instance - */ - cloudStorageId: { - get: () => data.cloud_storage_id, - }, - sortingMethod: { - /** - * @name sortingMethod - * @type {module:API.cvat.enums.SortingMethod} - * @memberof module:API.cvat.classes.Task - * @instance - * @readonly - */ - get: () => data.sorting_method, - }, - /** - * Source storage for import resources. - * @name sourceStorage - * @type {module:API.cvat.classes.Storage} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - sourceStorage: { - get: () => data.source_storage, - }, - /** - * Target storage for export resources. - * @name targetStorage - * @type {module:API.cvat.classes.Storage} - * @memberof module:API.cvat.classes.Task - * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} - */ - targetStorage: { - get: () => data.target_storage, - }, - _internalData: { - get: () => data, - }, - _updateTrigger: { - get: () => updateTrigger, - }, - }), - ); - - // When we call a function, for example: task.annotations.get() - // In the method get we lose the task context - // So, we need return it - this.annotations = { - get: Object.getPrototypeOf(this).annotations.get.bind(this), - put: Object.getPrototypeOf(this).annotations.put.bind(this), - save: Object.getPrototypeOf(this).annotations.save.bind(this), - merge: Object.getPrototypeOf(this).annotations.merge.bind(this), - split: Object.getPrototypeOf(this).annotations.split.bind(this), - group: Object.getPrototypeOf(this).annotations.group.bind(this), - clear: Object.getPrototypeOf(this).annotations.clear.bind(this), - search: Object.getPrototypeOf(this).annotations.search.bind(this), - searchEmpty: Object.getPrototypeOf(this).annotations.searchEmpty.bind(this), - upload: Object.getPrototypeOf(this).annotations.upload.bind(this), - select: Object.getPrototypeOf(this).annotations.select.bind(this), - import: Object.getPrototypeOf(this).annotations.import.bind(this), - export: Object.getPrototypeOf(this).annotations.export.bind(this), - statistics: Object.getPrototypeOf(this).annotations.statistics.bind(this), - hasUnsavedChanges: Object.getPrototypeOf(this).annotations.hasUnsavedChanges.bind(this), - exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), - }; - - this.actions = { - undo: Object.getPrototypeOf(this).actions.undo.bind(this), - redo: Object.getPrototypeOf(this).actions.redo.bind(this), - freeze: Object.getPrototypeOf(this).actions.freeze.bind(this), - clear: Object.getPrototypeOf(this).actions.clear.bind(this), - get: Object.getPrototypeOf(this).actions.get.bind(this), - }; - - this.frames = { - get: Object.getPrototypeOf(this).frames.get.bind(this), - delete: Object.getPrototypeOf(this).frames.delete.bind(this), - restore: Object.getPrototypeOf(this).frames.restore.bind(this), - save: Object.getPrototypeOf(this).frames.save.bind(this), - ranges: Object.getPrototypeOf(this).frames.ranges.bind(this), - preview: Object.getPrototypeOf(this).frames.preview.bind(this), - contextImage: Object.getPrototypeOf(this).frames.contextImage.bind(this), - search: Object.getPrototypeOf(this).frames.search.bind(this), - }; - - this.logger = { - log: Object.getPrototypeOf(this).logger.log.bind(this), - }; - - this.predictor = { - status: Object.getPrototypeOf(this).predictor.status.bind(this), - predict: Object.getPrototypeOf(this).predictor.predict.bind(this), - }; - } - /** - * Method removes all task related data from the client (annotations, history, etc.) - * @method close - * @returns {module:API.cvat.classes.Task} - * @memberof module:API.cvat.classes.Task - * @readonly + * Create a log and add it to a log collection
    + * Durable logs will be added after "close" method is called for them
    + * The fields "task_id" and "job_id" automatically added when add logs + * through a task or a job
    + * Ignore rules exist for some logs (e.g. zoomImage, changeAttribute)
    + * Payload of ignored logs are shallowly combined to previous logs of the same type + * @method log + * @memberof Session.logger + * @param {module:API.cvat.enums.LogType | string} type - log type + * @param {Object} [payload = {}] - any other data that will be appended to the log + * @param {boolean} [wait = false] - specifies if log is durable + * @returns {module:API.cvat.classes.Log} + * @instance * @async + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + /** + * Namespace is used for an interaction with actions + * @namespace actions + * @memberof Session + */ + /** + * @typedef {Object} HistoryActions + * @property {string[]} [undo] - array of possible actions to undo + * @property {string[]} [redo] - array of possible actions to redo + * @global + */ + /** + * Make undo + * @method undo + * @memberof Session.actions + * @param {number} [count=1] number of actions to undo + * @returns {number[]} Array of affected objects + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} * @instance + * @async + */ + /** + * Make redo + * @method redo + * @memberof Session.actions + * @param {number} [count=1] number of actions to redo + * @returns {number[]} Array of affected objects * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async */ - async close() { - const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.close); - return result; - } - /** - * Method updates data of a created task or creates new task from scratch - * @method save - * @returns {module:API.cvat.classes.Task} - * @memberof module:API.cvat.classes.Task - * @param {function} [onUpdate] - the function which is used only if task hasn't - * been created yet. It called in order to notify about creation status. - * It receives the string parameter which is a status message - * @readonly + * Freeze history (do not save new actions) + * @method freeze + * @memberof Session.actions + * @throws {module:API.cvat.exceptions.PluginError} * @instance * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} */ - async save(onUpdate = () => {}) { - const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.save, onUpdate); - return result; - } - /** - * Method deletes a task from a server - * @method delete - * @memberof module:API.cvat.classes.Task - * @readonly + * Remove all actions from history + * @method clear + * @memberof Session.actions + * @throws {module:API.cvat.exceptions.PluginError} * @instance * @async - * @throws {module:API.cvat.exceptions.ServerError} - * @throws {module:API.cvat.exceptions.PluginError} */ - async delete() { - const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.delete); - return result; - } - /** - * Method makes a backup of a task - * @method export - * @memberof module:API.cvat.classes.Task - * @readonly + * Get actions + * @method get + * @memberof Session.actions + * @returns {HistoryActions} + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @returns {Array.>} + * array of pairs [action name, frame number] * @instance * @async - * @throws {module:API.cvat.exceptions.ServerError} + */ + /** + * Namespace is used for an interaction with events + * @namespace events + * @memberof Session + */ + /** + * Subscribe on an event + * @method subscribe + * @memberof Session.events + * @param {module:API.cvat.enums.EventType} type - event type + * @param {functions} callback - function which will be called on event * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @instance + * @async */ - async export(targetStorage: Storage, fileName?: string) { - const result = await PluginRegistry.apiWrapper.call( - this, - Task.prototype.export, - targetStorage, - fileName - ); - return result; - } - /** - * Method imports a task from a backup - * @method import - * @memberof module:API.cvat.classes.Task - * @readonly + * Unsubscribe from an event. If callback is not provided, + * all callbacks will be removed from subscribers for the event + * @method unsubscribe + * @memberof Session.events + * @param {module:API.cvat.enums.EventType} type - event type + * @param {functions} [callback = null] - function which is called on event + * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} * @instance * @async + */ + /** + * @typedef {Object} PredictorStatus + * @property {string} message - message for a user to be displayed somewhere + * @property {number} projectScore - model accuracy + * @global + */ + /** + * Namespace is used for an interaction with events + * @namespace predictor + * @memberof Session + */ + /** + * Subscribe to updates of a ML model binded to the project + * @method status + * @memberof Session.predictor + * @throws {module:API.cvat.exceptions.PluginError} * @throws {module:API.cvat.exceptions.ServerError} + * @returns {PredictorStatus} + * @instance + * @async + */ + /** + * Get predictions from a ML model binded to the project + * @method predict + * @memberof Session.predictor + * @param {number} frame - number of frame to inference * @throws {module:API.cvat.exceptions.PluginError} + * @throws {module:API.cvat.exceptions.ArgumentError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.DataError} + * @returns {object[] | null} annotations + * @instance + * @async */ - static async import(storage: Storage, file: File | string) { - const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file); - return result; - } } +} + +/** + * Class representing a job. + * @memberof module:API.cvat.classes + * @hideconstructor + * @extends Session + */ +export class Job extends Session { + constructor(initialData) { + super(); + const data = { + id: undefined, + assignee: null, + stage: undefined, + state: undefined, + start_frame: undefined, + stop_frame: undefined, + project_id: null, + task_id: undefined, + labels: undefined, + dimension: undefined, + data_compressed_chunk_type: undefined, + data_chunk_size: undefined, + bug_tracker: null, + mode: undefined, + }; - module.exports = { - Job, - Task, - }; + const updateTrigger = new FieldUpdateTrigger(); - const { - getAnnotations, - putAnnotations, - saveAnnotations, - hasUnsavedChanges, - searchAnnotations, - searchEmptyFrame, - mergeAnnotations, - splitAnnotations, - groupAnnotations, - clearAnnotations, - selectObject, - annotationsStatistics, - uploadAnnotations, - importAnnotations, - exportAnnotations, - exportDataset, - undoActions, - redoActions, - freezeHistory, - clearActions, - getActions, - closeSession, - getHistory, - } = require('./annotations'); - - buildDuplicatedAPI(Job.prototype); - buildDuplicatedAPI(Task.prototype); - - Job.prototype.save.implementation = async function () { - if (this.id) { - const jobData = this._updateTrigger.getUpdated(this); - if (jobData.assignee) { - jobData.assignee = jobData.assignee.id; - } + for (const property in data) { + if (Object.prototype.hasOwnProperty.call(data, property)) { + if (property in initialData) { + data[property] = initialData[property]; + } - const data = await serverProxy.jobs.save(this.id, jobData); - this._updateTrigger.reset(); - return new Job(data); + if (data[property] === undefined) { + throw new ArgumentError(`Job field "${property}" was not initialized`); + } + } } - throw new ArgumentError('Could not save job without id'); - }; + if (data.assignee) data.assignee = new User(data.assignee); + if (Array.isArray(initialData.labels)) { + data.labels = initialData.labels.map((labelData) => { + // can be already wrapped to the class + // when create this job from Task constructor + if (labelData instanceof Label) { + return labelData; + } - Job.prototype.issues.implementation = async function () { - const result = await serverProxy.issues.get(this.id); - return result.map((issue) => new Issue(issue)); - }; + return new Label(labelData); + }).filter((label) => !label.hasParent); + } else { + throw new Error('Job labels must be an array'); + } + + Object.defineProperties( + this, + Object.freeze({ + /** + * @name id + * @type {number} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + id: { + get: () => data.id, + }, + /** + * Instance of a user who is responsible for the job annotations + * @name assignee + * @type {module:API.cvat.classes.User} + * @memberof module:API.cvat.classes.Job + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + assignee: { + get: () => data.assignee, + set: (assignee) => { + if (assignee !== null && !(assignee instanceof User)) { + throw new ArgumentError('Value must be a user instance'); + } + updateTrigger.update('assignee'); + data.assignee = assignee; + }, + }, + /** + * @name stage + * @type {module:API.cvat.enums.JobStage} + * @memberof module:API.cvat.classes.Job + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + stage: { + get: () => data.stage, + set: (stage) => { + const type = JobStage; + let valueInEnum = false; + for (const value in type) { + if (type[value] === stage) { + valueInEnum = true; + break; + } + } - Job.prototype.openIssue.implementation = async function (issue, message) { - checkObjectType('issue', issue, null, Issue); - checkObjectType('message', message, 'string'); - const result = await serverProxy.issues.create({ - ...issue.serialize(), - message, - }); - return new Issue(result); - }; + if (!valueInEnum) { + throw new ArgumentError( + 'Value must be a value from the enumeration cvat.enums.JobStage', + ); + } - Job.prototype.frames.get.implementation = async function (frame, isPlaying, step) { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); - } + updateTrigger.update('stage'); + data.stage = stage; + }, + }, + /** + * @name state + * @type {module:API.cvat.enums.JobState} + * @memberof module:API.cvat.classes.Job + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + state: { + get: () => data.state, + set: (state) => { + const type = JobState; + let valueInEnum = false; + for (const value in type) { + if (type[value] === state) { + valueInEnum = true; + break; + } + } - if (frame < this.startFrame || frame > this.stopFrame) { - throw new ArgumentError(`The frame with number ${frame} is out of the job`); - } + if (!valueInEnum) { + throw new ArgumentError( + 'Value must be a value from the enumeration cvat.enums.JobState', + ); + } + + updateTrigger.update('state'); + data.state = state; + }, + }, + /** + * @name startFrame + * @type {number} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + startFrame: { + get: () => data.start_frame, + }, + /** + * @name stopFrame + * @type {number} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + stopFrame: { + get: () => data.stop_frame, + }, + /** + * @name projectId + * @type {number|null} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + projectId: { + get: () => data.project_id, + }, + /** + * @name taskId + * @type {number} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + taskId: { + get: () => data.task_id, + }, + /** + * @name labels + * @type {module:API.cvat.classes.Label[]} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + labels: { + get: () => data.labels.filter((_label) => !_label.deleted), + }, + /** + * @name dimension + * @type {module:API.cvat.enums.DimensionType} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + dimension: { + get: () => data.dimension, + }, + /** + * @name dataChunkSize + * @type {number} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + dataChunkSize: { + get: () => data.data_chunk_size, + set: (chunkSize) => { + if (typeof chunkSize !== 'number' || chunkSize < 1) { + throw new ArgumentError( + `Chunk size value must be a positive number. But value ${chunkSize} has been got.`, + ); + } - const frameData = await getFrame( - this.id, - this.dataChunkSize, - this.dataChunkType, - this.mode, - frame, - this.startFrame, - this.stopFrame, - isPlaying, - step, - this.dimension, + data.data_chunk_size = chunkSize; + }, + }, + /** + * @name dataChunkSize + * @type {string} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + dataChunkType: { + get: () => data.data_compressed_chunk_type, + }, + /** + * @name mode + * @type {string} + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + */ + mode: { + get: () => data.mode, + }, + /** + * @name bugTracker + * @type {string|null} + * @memberof module:API.cvat.classes.Job + * @instance + * @readonly + */ + bugTracker: { + get: () => data.bug_tracker, + }, + _updateTrigger: { + get: () => updateTrigger, + }, + }), ); - return frameData; - }; - // must be called with task/job context - async function deleteFrameWrapper(jobID, frame) { - const history = getHistory(this); - const redo = async () => { - deleteFrame(jobID, frame); + // When we call a function, for example: task.annotations.get() + // In the method get we lose the task context + // So, we need return it + this.annotations = { + get: Object.getPrototypeOf(this).annotations.get.bind(this), + put: Object.getPrototypeOf(this).annotations.put.bind(this), + save: Object.getPrototypeOf(this).annotations.save.bind(this), + merge: Object.getPrototypeOf(this).annotations.merge.bind(this), + split: Object.getPrototypeOf(this).annotations.split.bind(this), + group: Object.getPrototypeOf(this).annotations.group.bind(this), + clear: Object.getPrototypeOf(this).annotations.clear.bind(this), + search: Object.getPrototypeOf(this).annotations.search.bind(this), + searchEmpty: Object.getPrototypeOf(this).annotations.searchEmpty.bind(this), + upload: Object.getPrototypeOf(this).annotations.upload.bind(this), + select: Object.getPrototypeOf(this).annotations.select.bind(this), + import: Object.getPrototypeOf(this).annotations.import.bind(this), + export: Object.getPrototypeOf(this).annotations.export.bind(this), + statistics: Object.getPrototypeOf(this).annotations.statistics.bind(this), + hasUnsavedChanges: Object.getPrototypeOf(this).annotations.hasUnsavedChanges.bind(this), + exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), }; - await redo(); - history.do(HistoryActions.REMOVED_FRAME, async () => { - restoreFrame(jobID, frame); - }, redo, [], frame); - } - - async function restoreFrameWrapper(jobID, frame) { - const history = getHistory(this); - const redo = async () => { - restoreFrame(jobID, frame); + this.actions = { + undo: Object.getPrototypeOf(this).actions.undo.bind(this), + redo: Object.getPrototypeOf(this).actions.redo.bind(this), + freeze: Object.getPrototypeOf(this).actions.freeze.bind(this), + clear: Object.getPrototypeOf(this).actions.clear.bind(this), + get: Object.getPrototypeOf(this).actions.get.bind(this), }; - await redo(); - history.do(HistoryActions.RESTORED_FRAME, async () => { - deleteFrame(jobID, frame); - }, redo, [], frame); - } - - Job.prototype.frames.delete.implementation = async function (frame) { - if (!Number.isInteger(frame)) { - throw new Error(`Frame must be an integer. Got: "${frame}"`); - } - - if (frame < this.startFrame || frame > this.stopFrame) { - throw new Error('The frame is out of the job'); - } - - await deleteFrameWrapper.call(this, this.id, frame); - }; - - Job.prototype.frames.restore.implementation = async function (frame) { - if (!Number.isInteger(frame)) { - throw new Error(`Frame must be an integer. Got: "${frame}"`); - } + this.frames = { + get: Object.getPrototypeOf(this).frames.get.bind(this), + delete: Object.getPrototypeOf(this).frames.delete.bind(this), + restore: Object.getPrototypeOf(this).frames.restore.bind(this), + save: Object.getPrototypeOf(this).frames.save.bind(this), + ranges: Object.getPrototypeOf(this).frames.ranges.bind(this), + preview: Object.getPrototypeOf(this).frames.preview.bind(this), + search: Object.getPrototypeOf(this).frames.search.bind(this), + contextImage: Object.getPrototypeOf(this).frames.contextImage.bind(this), + }; - if (frame < this.startFrame || frame > this.stopFrame) { - throw new Error('The frame is out of the job'); - } + this.logger = { + log: Object.getPrototypeOf(this).logger.log.bind(this), + }; - await restoreFrameWrapper.call(this, this.id, frame); - }; + this.predictor = { + status: Object.getPrototypeOf(this).predictor.status.bind(this), + predict: Object.getPrototypeOf(this).predictor.predict.bind(this), + }; + } - Job.prototype.frames.save.implementation = async function () { - const result = await patchMeta(this.id); + /** + * Method updates job data like state, stage or assignee + * @method save + * @memberof module:API.cvat.classes.Job + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async save() { + const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.save); return result; - }; - - Job.prototype.frames.ranges.implementation = async function () { - const rangesData = await getRanges(this.id); - return rangesData; - }; + } - Job.prototype.frames.preview.implementation = async function () { - if (this.id === null || this.taskId === null) { - return ''; - } + /** + * Method returns a list of issues for a job + * @method issues + * @memberof module:API.cvat.classes.Job + * @returns {module:API.cvat.classes.Issue[]} + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async issues() { + const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.issues); + return result; + } - const frameData = await getPreview(this.taskId, this.id); - return frameData; - }; + /** + * Method adds a new issue to a job + * @method openIssue + * @memberof module:API.cvat.classes.Job + * @returns {module:API.cvat.classes.Issue} + * @param {module:API.cvat.classes.Issue} issue + * @param {string} message + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ArgumentError} + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async openIssue(issue, message) { + const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.openIssue, issue, message); + return result; + } - Job.prototype.frames.contextImage.implementation = async function (frameId) { - const result = await getContextImage(this.id, frameId); + /** + * Method removes all job related data from the client (annotations, history, etc.) + * @method close + * @returns {module:API.cvat.classes.Job} + * @memberof module:API.cvat.classes.Job + * @readonly + * @async + * @instance + * @throws {module:API.cvat.exceptions.PluginError} + */ + async close() { + const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.close); return result; - }; + } +} + +/** + * Class representing a task + * @memberof module:API.cvat.classes + * @extends Session + */ +export class Task extends Session { + /** + * In a fact you need use the constructor only if you want to create a task + * @param {object} initialData - Object which is used for initialization + *
    It can contain keys: + *
  • name + *
  • assignee + *
  • bug_tracker + *
  • labels + *
  • segment_size + *
  • overlap + */ + constructor(initialData) { + super(); + const data = { + id: undefined, + name: undefined, + project_id: null, + status: undefined, + size: undefined, + mode: undefined, + owner: null, + assignee: null, + created_date: undefined, + updated_date: undefined, + bug_tracker: undefined, + subset: undefined, + overlap: undefined, + segment_size: undefined, + image_quality: undefined, + start_frame: undefined, + stop_frame: undefined, + frame_filter: undefined, + data_chunk_size: undefined, + data_compressed_chunk_type: undefined, + data_original_chunk_type: undefined, + deleted_frames: undefined, + use_zip_chunks: undefined, + use_cache: undefined, + copy_data: undefined, + dimension: undefined, + cloud_storage_id: undefined, + sorting_method: undefined, + source_storage: undefined, + target_storage: undefined, + }; - Job.prototype.frames.search.implementation = async function (filters, frameFrom, frameTo) { - if (typeof filters !== 'object') { - throw new ArgumentError('Filters should be an object'); - } + const updateTrigger = new FieldUpdateTrigger(); - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); + for (const property in data) { + if (Object.prototype.hasOwnProperty.call(data, property) && property in initialData) { + data[property] = initialData[property]; + } } - if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { - throw new ArgumentError('The start frame is out of the job'); - } + if (data.assignee) data.assignee = new User(data.assignee); + if (data.owner) data.owner = new User(data.owner); - if (frameTo < this.startFrame || frameTo > this.stopFrame) { - throw new ArgumentError('The stop frame is out of the job'); - } - if (filters.notDeleted) { - return findNotDeletedFrame(this.id, frameFrom, frameTo, filters.offset || 1); - } - return null; - }; + data.labels = []; + data.jobs = []; + data.files = Object.freeze({ + server_files: [], + client_files: [], + remote_files: [], + }); - // TODO: Check filter for annotations - Job.prototype.annotations.get.implementation = async function (frame, allTracks, filters) { - if (!Array.isArray(filters)) { - throw new ArgumentError('Filters must be an array'); + if (Array.isArray(initialData.labels)) { + data.labels = initialData.labels + .map((labelData) => new Label(labelData)).filter((label) => !label.hasParent); + } + + if (Array.isArray(initialData.segments)) { + for (const segment of initialData.segments) { + if (Array.isArray(segment.jobs)) { + for (const job of segment.jobs) { + const jobInstance = new Job({ + url: job.url, + id: job.id, + assignee: job.assignee, + state: job.state, + stage: job.stage, + start_frame: segment.start_frame, + stop_frame: segment.stop_frame, + // following fields also returned when doing API request /jobs/ + // here we know them from task and append to constructor + task_id: data.id, + project_id: data.project_id, + labels: data.labels, + bug_tracker: data.bug_tracker, + mode: data.mode, + dimension: data.dimension, + data_compressed_chunk_type: data.data_compressed_chunk_type, + data_chunk_size: data.data_chunk_size, + }); + + data.jobs.push(jobInstance); + } + } + } } - if (!Number.isInteger(frame)) { - throw new ArgumentError('The frame argument must be an integer'); - } + Object.defineProperties( + this, + Object.freeze({ + /** + * @name id + * @type {number} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + id: { + get: () => data.id, + }, + /** + * @name name + * @type {string} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + name: { + get: () => data.name, + set: (value) => { + if (!value.trim().length) { + throw new ArgumentError('Value must not be empty'); + } + updateTrigger.update('name'); + data.name = value; + }, + }, + /** + * @name projectId + * @type {number|null} + * @memberof module:API.cvat.classes.Task + * @instance + */ + projectId: { + get: () => data.project_id, + set: (projectId) => { + if (!Number.isInteger(projectId) || projectId <= 0) { + throw new ArgumentError('Value must be a positive integer'); + } - if (frame < this.startFrame || frame > this.stopFrame) { - throw new ArgumentError(`Frame ${frame} does not exist in the job`); - } + updateTrigger.update('projectId'); + data.project_id = projectId; + }, + }, + /** + * @name status + * @type {module:API.cvat.enums.TaskStatus} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + status: { + get: () => data.status, + }, + /** + * @name size + * @type {number} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + size: { + get: () => data.size, + }, + /** + * @name mode + * @type {TaskMode} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + mode: { + get: () => data.mode, + }, + /** + * Instance of a user who has created the task + * @name owner + * @type {module:API.cvat.classes.User} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + owner: { + get: () => data.owner, + }, + /** + * Instance of a user who is responsible for the task + * @name assignee + * @type {module:API.cvat.classes.User} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + assignee: { + get: () => data.assignee, + set: (assignee) => { + if (assignee !== null && !(assignee instanceof User)) { + throw new ArgumentError('Value must be a user instance'); + } + updateTrigger.update('assignee'); + data.assignee = assignee; + }, + }, + /** + * @name createdDate + * @type {string} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + createdDate: { + get: () => data.created_date, + }, + /** + * @name updatedDate + * @type {string} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + updatedDate: { + get: () => data.updated_date, + }, + /** + * @name bugTracker + * @type {string} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + bugTracker: { + get: () => data.bug_tracker, + set: (tracker) => { + if (typeof tracker !== 'string') { + throw new ArgumentError( + `Subset value must be a string. But ${typeof tracker} has been got.`, + ); + } - const annotationsData = await getAnnotations(this, frame, allTracks, filters); - const deletedFrames = await getDeletedFrames('job', this.id); - if (frame in deletedFrames) { - return []; - } + updateTrigger.update('bugTracker'); + data.bug_tracker = tracker; + }, + }, + /** + * @name subset + * @type {string} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exception.ArgumentError} + */ + subset: { + get: () => data.subset, + set: (subset) => { + if (typeof subset !== 'string') { + throw new ArgumentError( + `Subset value must be a string. But ${typeof subset} has been got.`, + ); + } - return annotationsData; - }; + updateTrigger.update('subset'); + data.subset = subset; + }, + }, + /** + * @name overlap + * @type {number} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + overlap: { + get: () => data.overlap, + set: (overlap) => { + if (!Number.isInteger(overlap) || overlap < 0) { + throw new ArgumentError('Value must be a non negative integer'); + } + data.overlap = overlap; + }, + }, + /** + * @name segmentSize + * @type {number} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + segmentSize: { + get: () => data.segment_size, + set: (segment) => { + if (!Number.isInteger(segment) || segment < 0) { + throw new ArgumentError('Value must be a positive integer'); + } + data.segment_size = segment; + }, + }, + /** + * @name imageQuality + * @type {number} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + imageQuality: { + get: () => data.image_quality, + set: (quality) => { + if (!Number.isInteger(quality) || quality < 0) { + throw new ArgumentError('Value must be a positive integer'); + } + data.image_quality = quality; + }, + }, + /** + * @name useZipChunks + * @type {boolean} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + useZipChunks: { + get: () => data.use_zip_chunks, + set: (useZipChunks) => { + if (typeof useZipChunks !== 'boolean') { + throw new ArgumentError('Value must be a boolean'); + } + data.use_zip_chunks = useZipChunks; + }, + }, + /** + * @name useCache + * @type {boolean} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + useCache: { + get: () => data.use_cache, + set: (useCache) => { + if (typeof useCache !== 'boolean') { + throw new ArgumentError('Value must be a boolean'); + } + 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; + }, + }, + /** + * @name labels + * @type {module:API.cvat.classes.Label[]} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + labels: { + get: () => data.labels.filter((_label) => !_label.deleted), + set: (labels) => { + if (!Array.isArray(labels)) { + throw new ArgumentError('Value must be an array of Labels'); + } - Job.prototype.annotations.search.implementation = function (filters, frameFrom, frameTo) { - if (!Array.isArray(filters)) { - throw new ArgumentError('Filters must be an array'); - } + for (const label of labels) { + if (!(label instanceof Label)) { + throw new ArgumentError( + `Each array value must be an instance of Label. ${typeof label} was found`, + ); + } + } - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); - } + const IDs = labels.map((_label) => _label.id); + const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id)); + deletedLabels.forEach((_label) => { + _label.deleted = true; + }); - if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { - throw new ArgumentError('The start frame is out of the job'); - } + updateTrigger.update('labels'); + data.labels = [...deletedLabels, ...labels]; + }, + }, + /** + * @name jobs + * @type {module:API.cvat.classes.Job[]} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + jobs: { + get: () => [...data.jobs], + }, + /** + * List of files from shared resource or list of cloud storage files + * @name serverFiles + * @type {string[]} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + serverFiles: { + get: () => [...data.files.server_files], + set: (serverFiles) => { + if (!Array.isArray(serverFiles)) { + throw new ArgumentError( + `Value must be an array. But ${typeof serverFiles} has been got.`, + ); + } - if (frameTo < this.startFrame || frameTo > this.stopFrame) { - throw new ArgumentError('The stop frame is out of the job'); - } + for (const value of serverFiles) { + if (typeof value !== 'string') { + throw new ArgumentError( + `Array values must be a string. But ${typeof value} has been got.`, + ); + } + } - const result = searchAnnotations(this, filters, frameFrom, frameTo); - return result; - }; + Array.prototype.push.apply(data.files.server_files, serverFiles); + }, + }, + /** + * List of files from client host + * @name clientFiles + * @type {File[]} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + clientFiles: { + get: () => [...data.files.client_files], + set: (clientFiles) => { + if (!Array.isArray(clientFiles)) { + throw new ArgumentError( + `Value must be an array. But ${typeof clientFiles} has been got.`, + ); + } - Job.prototype.annotations.searchEmpty.implementation = function (frameFrom, frameTo) { - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); - } + for (const value of clientFiles) { + if (!(value instanceof File)) { + throw new ArgumentError( + `Array values must be a File. But ${value.constructor.name} has been got.`, + ); + } + } - if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { - throw new ArgumentError('The start frame is out of the job'); - } + Array.prototype.push.apply(data.files.client_files, clientFiles); + }, + }, + /** + * List of files from remote host + * @name remoteFiles + * @type {File[]} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + remoteFiles: { + get: () => [...data.files.remote_files], + set: (remoteFiles) => { + if (!Array.isArray(remoteFiles)) { + throw new ArgumentError( + `Value must be an array. But ${typeof remoteFiles} has been got.`, + ); + } - if (frameTo < this.startFrame || frameTo > this.stopFrame) { - throw new ArgumentError('The stop frame is out of the job'); - } + for (const value of remoteFiles) { + if (typeof value !== 'string') { + throw new ArgumentError( + `Array values must be a string. But ${typeof value} has been got.`, + ); + } + } - const result = searchEmptyFrame(this, frameFrom, frameTo); - return result; - }; + Array.prototype.push.apply(data.files.remote_files, remoteFiles); + }, + }, + /** + * The first frame of a video to annotation + * @name startFrame + * @type {number} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + startFrame: { + get: () => data.start_frame, + set: (frame) => { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError('Value must be a not negative integer'); + } + data.start_frame = frame; + }, + }, + /** + * The last frame of a video to annotation + * @name stopFrame + * @type {number} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + stopFrame: { + get: () => data.stop_frame, + set: (frame) => { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError('Value must be a not negative integer'); + } + data.stop_frame = frame; + }, + }, + /** + * Filter to ignore some frames during task creation + * @name frameFilter + * @type {string} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + frameFilter: { + get: () => data.frame_filter, + set: (filter) => { + if (typeof filter !== 'string') { + throw new ArgumentError( + `Filter value must be a string. But ${typeof filter} has been got.`, + ); + } - Job.prototype.annotations.save.implementation = async function (onUpdate) { - const result = await saveAnnotations(this, onUpdate); - return result; - }; + data.frame_filter = filter; + }, + }, + dataChunkSize: { + get: () => data.data_chunk_size, + set: (chunkSize) => { + if (typeof chunkSize !== 'number' || chunkSize < 1) { + throw new ArgumentError( + `Chunk size value must be a positive number. But value ${chunkSize} has been got.`, + ); + } + + data.data_chunk_size = chunkSize; + }, + }, + dataChunkType: { + get: () => data.data_compressed_chunk_type, + }, + /** + * @name dimension + * @type {module:API.cvat.enums.DimensionType} + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + */ + dimension: { + get: () => data.dimension, + }, + /** + * @name cloudStorageId + * @type {integer|null} + * @memberof module:API.cvat.classes.Task + * @instance + */ + cloudStorageId: { + get: () => data.cloud_storage_id, + }, + sortingMethod: { + /** + * @name sortingMethod + * @type {module:API.cvat.enums.SortingMethod} + * @memberof module:API.cvat.classes.Task + * @instance + * @readonly + */ + get: () => data.sorting_method, + }, + /** + * Source storage for import resources. + * @name sourceStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + sourceStorage: { + get: () => data.source_storage, + }, + /** + * Target storage for export resources. + * @name targetStorage + * @type {module:API.cvat.classes.Storage} + * @memberof module:API.cvat.classes.Task + * @instance + * @throws {module:API.cvat.exceptions.ArgumentError} + */ + targetStorage: { + get: () => data.target_storage, + }, + _internalData: { + get: () => data, + }, + _updateTrigger: { + get: () => updateTrigger, + }, + }), + ); - Job.prototype.annotations.merge.implementation = async function (objectStates) { - const result = await mergeAnnotations(this, objectStates); - return result; - }; + // When we call a function, for example: task.annotations.get() + // In the method get we lose the task context + // So, we need return it + this.annotations = { + get: Object.getPrototypeOf(this).annotations.get.bind(this), + put: Object.getPrototypeOf(this).annotations.put.bind(this), + save: Object.getPrototypeOf(this).annotations.save.bind(this), + merge: Object.getPrototypeOf(this).annotations.merge.bind(this), + split: Object.getPrototypeOf(this).annotations.split.bind(this), + group: Object.getPrototypeOf(this).annotations.group.bind(this), + clear: Object.getPrototypeOf(this).annotations.clear.bind(this), + search: Object.getPrototypeOf(this).annotations.search.bind(this), + searchEmpty: Object.getPrototypeOf(this).annotations.searchEmpty.bind(this), + upload: Object.getPrototypeOf(this).annotations.upload.bind(this), + select: Object.getPrototypeOf(this).annotations.select.bind(this), + import: Object.getPrototypeOf(this).annotations.import.bind(this), + export: Object.getPrototypeOf(this).annotations.export.bind(this), + statistics: Object.getPrototypeOf(this).annotations.statistics.bind(this), + hasUnsavedChanges: Object.getPrototypeOf(this).annotations.hasUnsavedChanges.bind(this), + exportDataset: Object.getPrototypeOf(this).annotations.exportDataset.bind(this), + }; - Job.prototype.annotations.split.implementation = async function (objectState, frame) { - const result = await splitAnnotations(this, objectState, frame); - return result; - }; + this.actions = { + undo: Object.getPrototypeOf(this).actions.undo.bind(this), + redo: Object.getPrototypeOf(this).actions.redo.bind(this), + freeze: Object.getPrototypeOf(this).actions.freeze.bind(this), + clear: Object.getPrototypeOf(this).actions.clear.bind(this), + get: Object.getPrototypeOf(this).actions.get.bind(this), + }; - Job.prototype.annotations.group.implementation = async function (objectStates, reset) { - const result = await groupAnnotations(this, objectStates, reset); - return result; - }; + this.frames = { + get: Object.getPrototypeOf(this).frames.get.bind(this), + delete: Object.getPrototypeOf(this).frames.delete.bind(this), + restore: Object.getPrototypeOf(this).frames.restore.bind(this), + save: Object.getPrototypeOf(this).frames.save.bind(this), + ranges: Object.getPrototypeOf(this).frames.ranges.bind(this), + preview: Object.getPrototypeOf(this).frames.preview.bind(this), + contextImage: Object.getPrototypeOf(this).frames.contextImage.bind(this), + search: Object.getPrototypeOf(this).frames.search.bind(this), + }; - Job.prototype.annotations.hasUnsavedChanges.implementation = function () { - const result = hasUnsavedChanges(this); - return result; - }; + this.logger = { + log: Object.getPrototypeOf(this).logger.log.bind(this), + }; - Job.prototype.annotations.clear.implementation = async function ( - reload, startframe, endframe, delTrackKeyframesOnly, - ) { - const result = await clearAnnotations(this, reload, startframe, endframe, delTrackKeyframesOnly); - return result; - }; + this.predictor = { + status: Object.getPrototypeOf(this).predictor.status.bind(this), + predict: Object.getPrototypeOf(this).predictor.predict.bind(this), + }; + } - Job.prototype.annotations.select.implementation = function (frame, x, y) { - const result = selectObject(this, frame, x, y); + /** + * Method removes all task related data from the client (annotations, history, etc.) + * @method close + * @returns {module:API.cvat.classes.Task} + * @memberof module:API.cvat.classes.Task + * @readonly + * @async + * @instance + * @throws {module:API.cvat.exceptions.PluginError} + */ + async close() { + const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.close); return result; - }; + } - Job.prototype.annotations.statistics.implementation = function () { - const result = annotationsStatistics(this); + /** + * Method updates data of a created task or creates new task from scratch + * @method save + * @returns {module:API.cvat.classes.Task} + * @memberof module:API.cvat.classes.Task + * @param {function} [onUpdate] - the function which is used only if task hasn't + * been created yet. It called in order to notify about creation status. + * It receives the string parameter which is a status message + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async save(onUpdate = () => {}) { + const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.save, onUpdate); return result; - }; + } - Job.prototype.annotations.put.implementation = function (objectStates) { - const result = putAnnotations(this, objectStates); + /** + * Method deletes a task from a server + * @method delete + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async delete() { + const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.delete); return result; - }; + } - Job.prototype.annotations.upload.implementation = async function ( - format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string - ) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); + /** + * Method makes a backup of a task + * @method export + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + async export(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + const result = await PluginRegistry.apiWrapper.call( + this, + Task.prototype.export, + targetStorage, + useDefaultSettings, + fileName + ); return result; - }; + } - Job.prototype.annotations.import.implementation = function (data) { - const result = importAnnotations(this, data); + /** + * Method imports a task from a backup + * @method import + * @memberof module:API.cvat.classes.Task + * @readonly + * @instance + * @async + * @throws {module:API.cvat.exceptions.ServerError} + * @throws {module:API.cvat.exceptions.PluginError} + */ + static async import(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file); return result; - }; + } +} + +const { + getAnnotations, + putAnnotations, + saveAnnotations, + hasUnsavedChanges, + searchAnnotations, + searchEmptyFrame, + mergeAnnotations, + splitAnnotations, + groupAnnotations, + clearAnnotations, + selectObject, + annotationsStatistics, + uploadAnnotations, + importAnnotations, + exportAnnotations, + exportDataset, + undoActions, + redoActions, + freezeHistory, + clearActions, + getActions, + closeSession, + getHistory, +} = require('./annotations'); + +buildDuplicatedAPI(Job.prototype); +buildDuplicatedAPI(Task.prototype); + +Job.prototype.save.implementation = async function () { + if (this.id) { + const jobData = this._updateTrigger.getUpdated(this); + if (jobData.assignee) { + jobData.assignee = jobData.assignee.id; + } + + const data = await serverProxy.jobs.save(this.id, jobData); + this._updateTrigger.reset(); + return new Job(data); + } - Job.prototype.annotations.export.implementation = function () { - const result = exportAnnotations(this); - return result; - }; + throw new ArgumentError('Could not save job without id'); +}; + +Job.prototype.issues.implementation = async function () { + const result = await serverProxy.issues.get(this.id); + return result.map((issue) => new Issue(issue)); +}; + +Job.prototype.openIssue.implementation = async function (issue, message) { + checkObjectType('issue', issue, null, Issue); + checkObjectType('message', message, 'string'); + const result = await serverProxy.issues.create({ + ...issue.serialize(), + message, + }); + return new Issue(result); +}; + +Job.prototype.frames.get.implementation = async function (frame, isPlaying, step) { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); + } - Job.prototype.annotations.exportDataset.implementation = async function ( - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - customName?: string - ) { - const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); - return result; - }; + if (frame < this.startFrame || frame > this.stopFrame) { + throw new ArgumentError(`The frame with number ${frame} is out of the job`); + } - Job.prototype.actions.undo.implementation = async function (count) { - const result = await undoActions(this, count); - return result; - }; + const frameData = await getFrame( + this.id, + this.dataChunkSize, + this.dataChunkType, + this.mode, + frame, + this.startFrame, + this.stopFrame, + isPlaying, + step, + this.dimension, + ); + return frameData; +}; + +// must be called with task/job context +async function deleteFrameWrapper(jobID, frame) { + const history = getHistory(this); + const redo = async () => { + deleteFrame(jobID, frame); + }; + + await redo(); + history.do(HistoryActions.REMOVED_FRAME, async () => { + restoreFrame(jobID, frame); + }, redo, [], frame); +} + +async function restoreFrameWrapper(jobID, frame) { + const history = getHistory(this); + const redo = async () => { + restoreFrame(jobID, frame); + }; + + await redo(); + history.do(HistoryActions.RESTORED_FRAME, async () => { + deleteFrame(jobID, frame); + }, redo, [], frame); +} + +Job.prototype.frames.delete.implementation = async function (frame) { + if (!Number.isInteger(frame)) { + throw new Error(`Frame must be an integer. Got: "${frame}"`); + } - Job.prototype.actions.redo.implementation = async function (count) { - const result = await redoActions(this, count); - return result; - }; + if (frame < this.startFrame || frame > this.stopFrame) { + throw new Error('The frame is out of the job'); + } - Job.prototype.actions.freeze.implementation = function (frozen) { - const result = freezeHistory(this, frozen); - return result; - }; + await deleteFrameWrapper.call(this, this.id, frame); +}; - Job.prototype.actions.clear.implementation = function () { - const result = clearActions(this); - return result; - }; +Job.prototype.frames.restore.implementation = async function (frame) { + if (!Number.isInteger(frame)) { + throw new Error(`Frame must be an integer. Got: "${frame}"`); + } - Job.prototype.actions.get.implementation = function () { - const result = getActions(this); - return result; - }; + if (frame < this.startFrame || frame > this.stopFrame) { + throw new Error('The frame is out of the job'); + } - Job.prototype.logger.log.implementation = async function (logType, payload, wait) { - const result = await loggerStorage.log(logType, { ...payload, task_id: this.taskId, job_id: this.id }, wait); - return result; - }; + await restoreFrameWrapper.call(this, this.id, frame); +}; - Job.prototype.predictor.status.implementation = async function () { - if (!Number.isInteger(this.projectId)) { - throw new DataError('The job must belong to a project to use the feature'); - } +Job.prototype.frames.save.implementation = async function () { + const result = await patchMeta(this.id); + return result; +}; - const result = await serverProxy.predictor.status(this.projectId); - return { - message: result.message, - progress: result.progress, - projectScore: result.score, - timeRemaining: result.time_remaining, - mediaAmount: result.media_amount, - annotationAmount: result.annotation_amount, - }; - }; +Job.prototype.frames.ranges.implementation = async function () { + const rangesData = await getRanges(this.id); + return rangesData; +}; - Job.prototype.predictor.predict.implementation = async function (frame) { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); - } +Job.prototype.frames.preview.implementation = async function () { + if (this.id === null || this.taskId === null) { + return ''; + } - if (frame < this.startFrame || frame > this.stopFrame) { - throw new ArgumentError(`The frame with number ${frame} is out of the job`); - } + const frameData = await getPreview(this.taskId, this.id); + return frameData; +}; - if (!Number.isInteger(this.projectId)) { - throw new DataError('The job must belong to a project to use the feature'); - } +Job.prototype.frames.contextImage.implementation = async function (frameId) { + const result = await getContextImage(this.id, frameId); + return result; +}; - const result = await serverProxy.predictor.predict(this.taskId, frame); - return result; - }; +Job.prototype.frames.search.implementation = async function (filters, frameFrom, frameTo) { + if (typeof filters !== 'object') { + throw new ArgumentError('Filters should be an object'); + } - Job.prototype.close.implementation = function closeTask() { - clearFrames(this.id); - closeSession(this); - return this; - }; + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - Task.prototype.close.implementation = function closeTask() { - for (const job of this.jobs) { - clearFrames(job.id); - closeSession(job); - } + if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { + throw new ArgumentError('The start frame is out of the job'); + } - closeSession(this); - return this; - }; + if (frameTo < this.startFrame || frameTo > this.stopFrame) { + throw new ArgumentError('The stop frame is out of the job'); + } + if (filters.notDeleted) { + return findNotDeletedFrame(this.id, frameFrom, frameTo, filters.offset || 1); + } + return null; +}; - Task.prototype.save.implementation = async function (onUpdate) { - // TODO: Add ability to change an owner and an assignee - if (typeof this.id !== 'undefined') { - // If the task has been already created, we update it - const taskData = this._updateTrigger.getUpdated(this, { - bugTracker: 'bug_tracker', - projectId: 'project_id', - assignee: 'assignee_id', - }); - if (taskData.assignee_id) { - taskData.assignee_id = taskData.assignee_id.id; - } - if (taskData.labels) { - taskData.labels = this._internalData.labels; - taskData.labels = taskData.labels.map((el) => el.toJSON()); - } +// TODO: Check filter for annotations +Job.prototype.annotations.get.implementation = async function (frame, allTracks, filters) { + if (!Array.isArray(filters)) { + throw new ArgumentError('Filters must be an array'); + } - const data = await serverProxy.tasks.save(this.id, taskData); - this._updateTrigger.reset(); - return new Task(data); - } + if (!Number.isInteger(frame)) { + throw new ArgumentError('The frame argument must be an integer'); + } - const taskSpec: any = { - name: this.name, - labels: this.labels.map((el) => el.toJSON()), - }; + if (frame < this.startFrame || frame > this.stopFrame) { + throw new ArgumentError(`Frame ${frame} does not exist in the job`); + } - if (typeof this.bugTracker !== 'undefined') { - taskSpec.bug_tracker = this.bugTracker; - } - if (typeof this.segmentSize !== 'undefined') { - taskSpec.segment_size = this.segmentSize; - } - if (typeof this.overlap !== 'undefined') { - taskSpec.overlap = this.overlap; - } - if (typeof this.projectId !== 'undefined') { - taskSpec.project_id = this.projectId; - } - if (typeof this.subset !== 'undefined') { - taskSpec.subset = this.subset; - } + const annotationsData = await getAnnotations(this, frame, allTracks, filters); + const deletedFrames = await getDeletedFrames('job', this.id); + if (frame in deletedFrames) { + return []; + } - if (this.targetStorage) { - taskSpec.target_storage = this.targetStorage; - } + return annotationsData; +}; - if (this.sourceStorage) { - taskSpec.source_storage = this.sourceStorage; - } +Job.prototype.annotations.search.implementation = function (filters, frameFrom, frameTo) { + if (!Array.isArray(filters)) { + throw new ArgumentError('Filters must be an array'); + } - const taskDataSpec = { - client_files: this.clientFiles, - server_files: this.serverFiles, - remote_files: this.remoteFiles, - image_quality: this.imageQuality, - use_zip_chunks: this.useZipChunks, - use_cache: this.useCache, - sorting_method: this.sortingMethod, - }; + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - if (typeof this.startFrame !== 'undefined') { - taskDataSpec.start_frame = this.startFrame; - } - if (typeof this.stopFrame !== 'undefined') { - taskDataSpec.stop_frame = this.stopFrame; - } - if (typeof this.frameFilter !== 'undefined') { - taskDataSpec.frame_filter = this.frameFilter; - } - if (typeof this.dataChunkSize !== 'undefined') { - taskDataSpec.chunk_size = this.dataChunkSize; - } - if (typeof this.copyData !== 'undefined') { - taskDataSpec.copy_data = this.copyData; - } - if (typeof this.cloudStorageId !== 'undefined') { - taskDataSpec.cloud_storage_id = this.cloudStorageId; - } + if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { + throw new ArgumentError('The start frame is out of the job'); + } - const task = await serverProxy.tasks.create(taskSpec, taskDataSpec, onUpdate); - return new Task(task); - }; + if (frameTo < this.startFrame || frameTo > this.stopFrame) { + throw new ArgumentError('The stop frame is out of the job'); + } - Task.prototype.delete.implementation = async function () { - const result = await serverProxy.tasks.delete(this.id); - return result; - }; + const result = searchAnnotations(this, filters, frameFrom, frameTo); + return result; +}; - Task.prototype.export.implementation = async function (targetStorage: Storage, fileName?: string) { - const result = await serverProxy.tasks.export(this.id, targetStorage, fileName); - return result; - }; +Job.prototype.annotations.searchEmpty.implementation = function (frameFrom, frameTo) { + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - Task.import.implementation = async function (storage: Storage, file: File | string) { - // eslint-disable-next-line no-unsanitized/method - const result = await serverProxy.tasks.import(storage, file); - return result; - }; + if (frameFrom < this.startFrame || frameFrom > this.stopFrame) { + throw new ArgumentError('The start frame is out of the job'); + } - Task.prototype.frames.get.implementation = async function (frame, isPlaying, step) { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); - } + if (frameTo < this.startFrame || frameTo > this.stopFrame) { + throw new ArgumentError('The stop frame is out of the job'); + } - if (frame >= this.size) { - throw new ArgumentError(`The frame with number ${frame} is out of the task`); - } + const result = searchEmptyFrame(this, frameFrom, frameTo); + return result; +}; + +Job.prototype.annotations.save.implementation = async function (onUpdate) { + const result = await saveAnnotations(this, onUpdate); + return result; +}; + +Job.prototype.annotations.merge.implementation = async function (objectStates) { + const result = await mergeAnnotations(this, objectStates); + return result; +}; + +Job.prototype.annotations.split.implementation = async function (objectState, frame) { + const result = await splitAnnotations(this, objectState, frame); + return result; +}; + +Job.prototype.annotations.group.implementation = async function (objectStates, reset) { + const result = await groupAnnotations(this, objectStates, reset); + return result; +}; + +Job.prototype.annotations.hasUnsavedChanges.implementation = function () { + const result = hasUnsavedChanges(this); + return result; +}; + +Job.prototype.annotations.clear.implementation = async function ( + reload, startframe, endframe, delTrackKeyframesOnly, +) { + const result = await clearAnnotations(this, reload, startframe, endframe, delTrackKeyframesOnly); + return result; +}; + +Job.prototype.annotations.select.implementation = function (frame, x, y) { + const result = selectObject(this, frame, x, y); + return result; +}; + +Job.prototype.annotations.statistics.implementation = function () { + const result = annotationsStatistics(this); + return result; +}; + +Job.prototype.annotations.put.implementation = function (objectStates) { + const result = putAnnotations(this, objectStates); + return result; +}; + +Job.prototype.annotations.upload.implementation = async function ( + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string +) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); + return result; +}; + +Job.prototype.annotations.import.implementation = function (data) { + const result = importAnnotations(this, data); + return result; +}; + +Job.prototype.annotations.export.implementation = function () { + const result = exportAnnotations(this); + return result; +}; + +Job.prototype.annotations.exportDataset.implementation = async function ( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string +) { + const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); + return result; +}; + +Job.prototype.actions.undo.implementation = async function (count) { + const result = await undoActions(this, count); + return result; +}; + +Job.prototype.actions.redo.implementation = async function (count) { + const result = await redoActions(this, count); + return result; +}; + +Job.prototype.actions.freeze.implementation = function (frozen) { + const result = freezeHistory(this, frozen); + return result; +}; + +Job.prototype.actions.clear.implementation = function () { + const result = clearActions(this); + return result; +}; + +Job.prototype.actions.get.implementation = function () { + const result = getActions(this); + return result; +}; + +Job.prototype.logger.log.implementation = async function (logType, payload, wait) { + const result = await loggerStorage.log(logType, { ...payload, task_id: this.taskId, job_id: this.id }, wait); + return result; +}; + +Job.prototype.predictor.status.implementation = async function () { + if (!Number.isInteger(this.projectId)) { + throw new DataError('The job must belong to a project to use the feature'); + } - const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; - - const result = await getFrame( - job.id, - this.dataChunkSize, - this.dataChunkType, - this.mode, - frame, - job.startFrame, - job.stopFrame, - isPlaying, - step, - ); - return result; + const result = await serverProxy.predictor.status(this.projectId); + return { + message: result.message, + progress: result.progress, + projectScore: result.score, + timeRemaining: result.time_remaining, + mediaAmount: result.media_amount, + annotationAmount: result.annotation_amount, }; +}; - Task.prototype.frames.ranges.implementation = async function () { - const rangesData = { - decoded: [], - buffered: [], - }; - for (const job of this.jobs) { - const { decoded, buffered } = await getRanges(job.id); - rangesData.decoded.push(decoded); - rangesData.buffered.push(buffered); - } - return rangesData; - }; +Job.prototype.predictor.predict.implementation = async function (frame) { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); + } - Task.prototype.frames.preview.implementation = async function () { - if (this.id === null) { - return ''; - } + if (frame < this.startFrame || frame > this.stopFrame) { + throw new ArgumentError(`The frame with number ${frame} is out of the job`); + } - const frameData = await getPreview(this.id); - return frameData; - }; + if (!Number.isInteger(this.projectId)) { + throw new DataError('The job must belong to a project to use the feature'); + } - Task.prototype.frames.delete.implementation = async function (frame) { - if (!Number.isInteger(frame)) { - throw new Error(`Frame must be an integer. Got: "${frame}"`); - } + const result = await serverProxy.predictor.predict(this.taskId, frame); + return result; +}; - if (frame < 0 || frame >= this.size) { - throw new Error('The frame is out of the task'); - } +Job.prototype.close.implementation = function closeTask() { + clearFrames(this.id); + closeSession(this); + return this; +}; - const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; - if (job) { - await deleteFrameWrapper.call(this, job.id, frame); - } - }; +Task.prototype.close.implementation = function closeTask() { + for (const job of this.jobs) { + clearFrames(job.id); + closeSession(job); + } - Task.prototype.frames.restore.implementation = async function (frame) { - if (!Number.isInteger(frame)) { - throw new Error(`Frame must be an integer. Got: "${frame}"`); + closeSession(this); + return this; +}; + +Task.prototype.save.implementation = async function (onUpdate) { + // TODO: Add ability to change an owner and an assignee + if (typeof this.id !== 'undefined') { + // If the task has been already created, we update it + const taskData = this._updateTrigger.getUpdated(this, { + bugTracker: 'bug_tracker', + projectId: 'project_id', + assignee: 'assignee_id', + }); + if (taskData.assignee_id) { + taskData.assignee_id = taskData.assignee_id.id; } - - if (frame < 0 || frame >= this.size) { - throw new Error('The frame is out of the task'); + if (taskData.labels) { + taskData.labels = this._internalData.labels; + taskData.labels = taskData.labels.map((el) => el.toJSON()); } - const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; - if (job) { - await restoreFrameWrapper.call(this, job.id, frame); - } - }; + const data = await serverProxy.tasks.save(this.id, taskData); + this._updateTrigger.reset(); + return new Task(data); + } - Task.prototype.frames.save.implementation = async function () { - return Promise.all(this.jobs.map((job) => patchMeta(job.id))); + const taskSpec: any = { + name: this.name, + labels: this.labels.map((el) => el.toJSON()), }; - Task.prototype.frames.search.implementation = async function (filters, frameFrom, frameTo) { - if (typeof filters !== 'object') { - throw new ArgumentError('Filters should be an object'); - } - - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); - } - - if (frameFrom < 0 || frameFrom > this.size) { - throw new ArgumentError('The start frame is out of the task'); - } - - if (frameTo < 0 || frameTo > this.size) { - throw new ArgumentError('The stop frame is out of the task'); - } - - const jobs = this.jobs.filter((_job) => ( - (frameFrom >= _job.startFrame && frameFrom <= _job.stopFrame) || - (frameTo >= _job.startFrame && frameTo <= _job.stopFrame) || - (frameFrom < _job.startFrame && frameTo > _job.stopFrame) - )); + if (typeof this.bugTracker !== 'undefined') { + taskSpec.bug_tracker = this.bugTracker; + } + if (typeof this.segmentSize !== 'undefined') { + taskSpec.segment_size = this.segmentSize; + } + if (typeof this.overlap !== 'undefined') { + taskSpec.overlap = this.overlap; + } + if (typeof this.projectId !== 'undefined') { + taskSpec.project_id = this.projectId; + } + if (typeof this.subset !== 'undefined') { + taskSpec.subset = this.subset; + } - if (filters.notDeleted) { - for (const job of jobs) { - const result = await findNotDeletedFrame( - job.id, Math.max(frameFrom, job.startFrame), Math.min(frameTo, job.stopFrame), 1, - ); + if (this.targetStorage) { + taskSpec.target_storage = this.targetStorage; + } - if (result !== null) return result; - } - } + if (this.sourceStorage) { + taskSpec.source_storage = this.sourceStorage; + } - return null; + const taskDataSpec = { + client_files: this.clientFiles, + server_files: this.serverFiles, + remote_files: this.remoteFiles, + image_quality: this.imageQuality, + use_zip_chunks: this.useZipChunks, + use_cache: this.useCache, + sorting_method: this.sortingMethod, }; - // TODO: Check filter for annotations - Task.prototype.annotations.get.implementation = async function (frame, allTracks, filters) { - if (!Array.isArray(filters) || filters.some((filter) => typeof filter !== 'string')) { - throw new ArgumentError('The filters argument must be an array of strings'); - } + if (typeof this.startFrame !== 'undefined') { + taskDataSpec.start_frame = this.startFrame; + } + if (typeof this.stopFrame !== 'undefined') { + taskDataSpec.stop_frame = this.stopFrame; + } + if (typeof this.frameFilter !== 'undefined') { + taskDataSpec.frame_filter = this.frameFilter; + } + if (typeof this.dataChunkSize !== 'undefined') { + taskDataSpec.chunk_size = this.dataChunkSize; + } + if (typeof this.copyData !== 'undefined') { + taskDataSpec.copy_data = this.copyData; + } + if (typeof this.cloudStorageId !== 'undefined') { + taskDataSpec.cloud_storage_id = this.cloudStorageId; + } - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); - } + const task = await serverProxy.tasks.create(taskSpec, taskDataSpec, onUpdate); + return new Task(task); +}; + +Task.prototype.delete.implementation = async function () { + const result = await serverProxy.tasks.delete(this.id); + return result; +}; + +Task.prototype.export.implementation = async function ( + targetStorage: Storage, + useDefaultSettings: boolean, + fileName?: string +) { + const result = await serverProxy.tasks.export(this.id, targetStorage, useDefaultSettings, fileName); + return result; +}; + +Task.import.implementation = async function (storage: Storage, file: File | string) { + // eslint-disable-next-line no-unsanitized/method + const result = await serverProxy.tasks.import(storage, file); + return result; +}; + +Task.prototype.frames.get.implementation = async function (frame, isPlaying, step) { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); + } - if (frame >= this.size) { - throw new ArgumentError(`Frame ${frame} does not exist in the task`); - } + if (frame >= this.size) { + throw new ArgumentError(`The frame with number ${frame} is out of the task`); + } - const result = await getAnnotations(this, frame, allTracks, filters); - const deletedFrames = await getDeletedFrames('task', this.id); - if (frame in deletedFrames) { - return []; - } + const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; + + const result = await getFrame( + job.id, + this.dataChunkSize, + this.dataChunkType, + this.mode, + frame, + job.startFrame, + job.stopFrame, + isPlaying, + step, + ); + return result; +}; + +Task.prototype.frames.ranges.implementation = async function () { + const rangesData = { + decoded: [], + buffered: [], + }; + for (const job of this.jobs) { + const { decoded, buffered } = await getRanges(job.id); + rangesData.decoded.push(decoded); + rangesData.buffered.push(buffered); + } + return rangesData; +}; - return result; - }; +Task.prototype.frames.preview.implementation = async function () { + if (this.id === null) { + return ''; + } - Task.prototype.annotations.search.implementation = function (filters, frameFrom, frameTo) { - if (!Array.isArray(filters) || filters.some((filter) => typeof filter !== 'string')) { - throw new ArgumentError('The filters argument must be an array of strings'); - } + const frameData = await getPreview(this.id); + return frameData; +}; - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); - } +Task.prototype.frames.delete.implementation = async function (frame) { + if (!Number.isInteger(frame)) { + throw new Error(`Frame must be an integer. Got: "${frame}"`); + } - if (frameFrom < 0 || frameFrom >= this.size) { - throw new ArgumentError('The start frame is out of the task'); - } + if (frame < 0 || frame >= this.size) { + throw new Error('The frame is out of the task'); + } - if (frameTo < 0 || frameTo >= this.size) { - throw new ArgumentError('The stop frame is out of the task'); - } + const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; + if (job) { + await deleteFrameWrapper.call(this, job.id, frame); + } +}; - const result = searchAnnotations(this, filters, frameFrom, frameTo); - return result; - }; +Task.prototype.frames.restore.implementation = async function (frame) { + if (!Number.isInteger(frame)) { + throw new Error(`Frame must be an integer. Got: "${frame}"`); + } - Task.prototype.annotations.searchEmpty.implementation = function (frameFrom, frameTo) { - if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { - throw new ArgumentError('The start and end frames both must be an integer'); - } + if (frame < 0 || frame >= this.size) { + throw new Error('The frame is out of the task'); + } - if (frameFrom < 0 || frameFrom >= this.size) { - throw new ArgumentError('The start frame is out of the task'); - } + const job = this.jobs.filter((_job) => _job.startFrame <= frame && _job.stopFrame >= frame)[0]; + if (job) { + await restoreFrameWrapper.call(this, job.id, frame); + } +}; - if (frameTo < 0 || frameTo >= this.size) { - throw new ArgumentError('The stop frame is out of the task'); - } +Task.prototype.frames.save.implementation = async function () { + return Promise.all(this.jobs.map((job) => patchMeta(job.id))); +}; - const result = searchEmptyFrame(this, frameFrom, frameTo); - return result; - }; +Task.prototype.frames.search.implementation = async function (filters, frameFrom, frameTo) { + if (typeof filters !== 'object') { + throw new ArgumentError('Filters should be an object'); + } - Task.prototype.annotations.save.implementation = async function (onUpdate) { - const result = await saveAnnotations(this, onUpdate); - return result; - }; + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - Task.prototype.annotations.merge.implementation = async function (objectStates) { - const result = await mergeAnnotations(this, objectStates); - return result; - }; + if (frameFrom < 0 || frameFrom > this.size) { + throw new ArgumentError('The start frame is out of the task'); + } - Task.prototype.annotations.split.implementation = async function (objectState, frame) { - const result = await splitAnnotations(this, objectState, frame); - return result; - }; + if (frameTo < 0 || frameTo > this.size) { + throw new ArgumentError('The stop frame is out of the task'); + } - Task.prototype.annotations.group.implementation = async function (objectStates, reset) { - const result = await groupAnnotations(this, objectStates, reset); - return result; - }; + const jobs = this.jobs.filter((_job) => ( + (frameFrom >= _job.startFrame && frameFrom <= _job.stopFrame) || + (frameTo >= _job.startFrame && frameTo <= _job.stopFrame) || + (frameFrom < _job.startFrame && frameTo > _job.stopFrame) + )); - Task.prototype.annotations.hasUnsavedChanges.implementation = function () { - const result = hasUnsavedChanges(this); - return result; - }; + if (filters.notDeleted) { + for (const job of jobs) { + const result = await findNotDeletedFrame( + job.id, Math.max(frameFrom, job.startFrame), Math.min(frameTo, job.stopFrame), 1, + ); - Task.prototype.annotations.clear.implementation = async function (reload) { - const result = await clearAnnotations(this, reload); - return result; - }; + if (result !== null) return result; + } + } - Task.prototype.annotations.select.implementation = function (frame, x, y) { - const result = selectObject(this, frame, x, y); - return result; - }; + return null; +}; - Task.prototype.annotations.statistics.implementation = function () { - const result = annotationsStatistics(this); - return result; - }; +// TODO: Check filter for annotations +Task.prototype.annotations.get.implementation = async function (frame, allTracks, filters) { + if (!Array.isArray(filters) || filters.some((filter) => typeof filter !== 'string')) { + throw new ArgumentError('The filters argument must be an array of strings'); + } - Task.prototype.annotations.put.implementation = function (objectStates) { - const result = putAnnotations(this, objectStates); - return result; - }; + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); + } - Task.prototype.annotations.upload.implementation = async function ( - format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string - ) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); - return result; - }; + if (frame >= this.size) { + throw new ArgumentError(`Frame ${frame} does not exist in the task`); + } - Task.prototype.annotations.import.implementation = function (data) { - const result = importAnnotations(this, data); - return result; - }; + const result = await getAnnotations(this, frame, allTracks, filters); + const deletedFrames = await getDeletedFrames('task', this.id); + if (frame in deletedFrames) { + return []; + } - Task.prototype.annotations.export.implementation = function () { - const result = exportAnnotations(this); - return result; - }; + return result; +}; - Task.prototype.annotations.exportDataset.implementation = async function ( - format: string, - saveImages: boolean, - useDefaultSettings: boolean, - targetStorage: Storage, - customName?: string - ) { - const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); - return result; - }; +Task.prototype.annotations.search.implementation = function (filters, frameFrom, frameTo) { + if (!Array.isArray(filters) || filters.some((filter) => typeof filter !== 'string')) { + throw new ArgumentError('The filters argument must be an array of strings'); + } - Task.prototype.actions.undo.implementation = function (count) { - const result = undoActions(this, count); - return result; - }; + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - Task.prototype.actions.redo.implementation = function (count) { - const result = redoActions(this, count); - return result; - }; + if (frameFrom < 0 || frameFrom >= this.size) { + throw new ArgumentError('The start frame is out of the task'); + } - Task.prototype.actions.freeze.implementation = function (frozen) { - const result = freezeHistory(this, frozen); - return result; - }; + if (frameTo < 0 || frameTo >= this.size) { + throw new ArgumentError('The stop frame is out of the task'); + } - Task.prototype.actions.clear.implementation = function () { - const result = clearActions(this); - return result; - }; + const result = searchAnnotations(this, filters, frameFrom, frameTo); + return result; +}; - Task.prototype.actions.get.implementation = function () { - const result = getActions(this); - return result; - }; +Task.prototype.annotations.searchEmpty.implementation = function (frameFrom, frameTo) { + if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) { + throw new ArgumentError('The start and end frames both must be an integer'); + } - Task.prototype.logger.log.implementation = async function (logType, payload, wait) { - const result = await loggerStorage.log(logType, { ...payload, task_id: this.id }, wait); - return result; - }; + if (frameFrom < 0 || frameFrom >= this.size) { + throw new ArgumentError('The start frame is out of the task'); + } - Task.prototype.predictor.status.implementation = async function () { - if (!Number.isInteger(this.projectId)) { - throw new DataError('The task must belong to a project to use the feature'); - } + if (frameTo < 0 || frameTo >= this.size) { + throw new ArgumentError('The stop frame is out of the task'); + } - const result = await serverProxy.predictor.status(this.projectId); - return { - message: result.message, - progress: result.progress, - projectScore: result.score, - timeRemaining: result.time_remaining, - mediaAmount: result.media_amount, - annotationAmount: result.annotation_amount, - }; + const result = searchEmptyFrame(this, frameFrom, frameTo); + return result; +}; + +Task.prototype.annotations.save.implementation = async function (onUpdate) { + const result = await saveAnnotations(this, onUpdate); + return result; +}; + +Task.prototype.annotations.merge.implementation = async function (objectStates) { + const result = await mergeAnnotations(this, objectStates); + return result; +}; + +Task.prototype.annotations.split.implementation = async function (objectState, frame) { + const result = await splitAnnotations(this, objectState, frame); + return result; +}; + +Task.prototype.annotations.group.implementation = async function (objectStates, reset) { + const result = await groupAnnotations(this, objectStates, reset); + return result; +}; + +Task.prototype.annotations.hasUnsavedChanges.implementation = function () { + const result = hasUnsavedChanges(this); + return result; +}; + +Task.prototype.annotations.clear.implementation = async function (reload) { + const result = await clearAnnotations(this, reload); + return result; +}; + +Task.prototype.annotations.select.implementation = function (frame, x, y) { + const result = selectObject(this, frame, x, y); + return result; +}; + +Task.prototype.annotations.statistics.implementation = function () { + const result = annotationsStatistics(this); + return result; +}; + +Task.prototype.annotations.put.implementation = function (objectStates) { + const result = putAnnotations(this, objectStates); + return result; +}; + +Task.prototype.annotations.upload.implementation = async function ( + format: string, + useDefaultLocation: boolean, + sourceStorage: Storage, + file: File | string +) { + const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); + return result; +}; + +Task.prototype.annotations.import.implementation = function (data) { + const result = importAnnotations(this, data); + return result; +}; + +Task.prototype.annotations.export.implementation = function () { + const result = exportAnnotations(this); + return result; +}; + +Task.prototype.annotations.exportDataset.implementation = async function ( + format: string, + saveImages: boolean, + useDefaultSettings: boolean, + targetStorage: Storage, + customName?: string +) { + const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); + return result; +}; + +Task.prototype.actions.undo.implementation = function (count) { + const result = undoActions(this, count); + return result; +}; + +Task.prototype.actions.redo.implementation = function (count) { + const result = redoActions(this, count); + return result; +}; + +Task.prototype.actions.freeze.implementation = function (frozen) { + const result = freezeHistory(this, frozen); + return result; +}; + +Task.prototype.actions.clear.implementation = function () { + const result = clearActions(this); + return result; +}; + +Task.prototype.actions.get.implementation = function () { + const result = getActions(this); + return result; +}; + +Task.prototype.logger.log.implementation = async function (logType, payload, wait) { + const result = await loggerStorage.log(logType, { ...payload, task_id: this.id }, wait); + return result; +}; + +Task.prototype.predictor.status.implementation = async function () { + if (!Number.isInteger(this.projectId)) { + throw new DataError('The task must belong to a project to use the feature'); + } + + const result = await serverProxy.predictor.status(this.projectId); + return { + message: result.message, + progress: result.progress, + projectScore: result.score, + timeRemaining: result.time_remaining, + mediaAmount: result.media_amount, + annotationAmount: result.annotation_amount, }; +}; - Task.prototype.predictor.predict.implementation = async function (frame) { - if (!Number.isInteger(frame) || frame < 0) { - throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); - } +Task.prototype.predictor.predict.implementation = async function (frame) { + if (!Number.isInteger(frame) || frame < 0) { + throw new ArgumentError(`Frame must be a positive integer. Got: "${frame}"`); + } - if (frame >= this.size) { - throw new ArgumentError(`The frame with number ${frame} is out of the task`); - } + if (frame >= this.size) { + throw new ArgumentError(`The frame with number ${frame} is out of the task`); + } - if (!Number.isInteger(this.projectId)) { - throw new DataError('The task must belong to a project to use the feature'); - } + if (!Number.isInteger(this.projectId)) { + throw new DataError('The task must belong to a project to use the feature'); + } - const result = await serverProxy.predictor.predict(this.id, frame); - return result; - }; -})(); + const result = await serverProxy.predictor.predict(this.id, frame); + return result; +}; diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 4eadfa2d38d..e03ac870ad0 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -4,9 +4,9 @@ // SPDX-License-Identifier: MIT import { ActionUnion, createAction, ThunkAction } from 'utils/redux'; -import { Storage } from 'reducers/interfaces'; +import { Storage } from 'reducers'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; const core = getCore(); @@ -73,12 +73,12 @@ export const exportDatasetAsync = ( } }; -export const exportBackupAsync = (instance: any, targetStorage: Storage, fileName?: string): ThunkAction => async (dispatch) => { +export const exportBackupAsync = (instance: any, targetStorage: Storage, useDefaultSetting: boolean, fileName?: string): ThunkAction => async (dispatch) => { dispatch(exportActions.exportBackup(instance.id)); const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; try { - const result = await instance.export(targetStorage, fileName); + const result = await instance.export(targetStorage, useDefaultSetting, fileName); if (result) { const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; downloadAnchor.href = result; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index c926cd8527f..358b4f01221 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -6,8 +6,8 @@ import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; import { CombinedState } from 'reducers'; import { getProjectsAsync } from './projects-actions'; -import { Storage } from 'reducers/interfaces'; -import getCore from 'cvat-core-wrapper'; +import { Storage } from 'reducers'; +import { getCore } from 'cvat-core-wrapper'; import { LogType } from 'cvat-logger'; import { jobInfoGenerator, receiveAnnotationsParameters, AnnotationActionTypes } from 'actions/annotation-actions'; diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index ee79fb0abd3..ded4d547fe4 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -3,8 +3,8 @@ // SPDX-License-Identifier: MIT import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; -import { Storage } from 'reducers/interfaces'; -import getCore from 'cvat-core-wrapper'; +import { Storage } from 'reducers'; +import { getCore } from 'cvat-core-wrapper'; const core = getCore(); diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index e4e61e9d4a9..b7432310b69 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -22,7 +22,7 @@ import patterns from 'utils/validation-patterns'; import LabelsEditor from 'components/labels-editor/labels-editor'; import { createProjectAsync } from 'actions/projects-actions'; import CreateProjectContext from './create-project.context'; -import { StorageLocation } from 'reducers/interfaces'; +import { StorageLocation } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index e27a7efa9de..9e58fa34aca 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -16,11 +16,11 @@ import Text from 'antd/lib/typography/Text'; import { Store } from 'antd/lib/form/interface'; import CVATTooltip from 'components/common/cvat-tooltip'; import patterns from 'utils/validation-patterns'; -import { StorageLocation } from 'reducers/interfaces'; +import { StorageLocation } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; const core = getCore(); diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index b47464c57c2..c840c6b49b3 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -23,7 +23,7 @@ import ProjectSearchField from './project-search-field'; import ProjectSubsetField from './project-subset-field'; import AdvancedConfigurationForm, { AdvancedConfiguration, SortingMethod } from './advanced-configuration-form'; -import { StorageLocation } from 'reducers/interfaces'; +import { StorageLocation } from 'reducers'; export interface CreateTaskData { projectId: number | null; diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index cdc48572241..eba08cdaa8c 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -12,9 +12,9 @@ import Text from 'antd/lib/typography/Text'; import Input from 'antd/lib/input'; import Form from 'antd/lib/form'; -import { CombinedState, Storage } from 'reducers/interfaces'; +import { CombinedState, Storage } from 'reducers'; import { exportActions, exportBackupAsync } from 'actions/export-actions'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -103,6 +103,7 @@ function ExportBackupModal(): JSX.Element | null { location: useDefaultStorage ? defaultStorageLocation : values.targetStorage?.location, cloudStorageId: useDefaultStorage ? defaultStorageCloudId : values.targetStorage?.cloud_storage_id, } as Storage, + useDefaultStorage, values.customName ? `${values.customName}.zip` : undefined ), ); diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index 916f37d3be2..f6f01bc768e 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -12,10 +12,9 @@ import Notification from 'antd/lib/notification'; import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; import { InboxOutlined } from '@ant-design/icons'; -import { CombinedState } from 'reducers/interfaces'; +import { CombinedState, Storage, StorageLocation } from 'reducers'; import { importBackupActions, importBackupAsync } from 'actions/import-backup-actions'; import SourceStorageField from 'components/storage/source-storage-field'; -import { Storage, StorageLocation } from 'reducers/interfaces'; import Input from 'antd/lib/input/Input'; type FormValues = { diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 284ae96d56b..a536753bf7b 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -13,19 +13,17 @@ import Select from 'antd/lib/select'; import Notification from 'antd/lib/notification'; import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; -import { StorageLocation } from 'reducers/interfaces'; import { UploadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleOutlined, } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; -import { CombinedState } from 'reducers/interfaces'; +import { CombinedState, Storage, StorageLocation } from 'reducers'; import { importActions, importDatasetAsync } from 'actions/import-actions'; import ImportDatasetStatusModal from './import-dataset-status-modal'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; import StorageField from 'components/storage/storage-field'; -import { Storage } from 'reducers/interfaces'; import Input from 'antd/lib/input/Input'; const { confirm } = Modal; @@ -397,7 +395,7 @@ function ImportDatasetModal(): JSX.Element | null { ...uploadParams, sourceStorage: { location: (value.location) ? value.location : defaultStorageLocation, - cloudStorageId: (value.location) ? value.cloudStorageId : defaultStorageCloudId, + cloudStorageId: (value.location) ? value.cloud_storage_id : defaultStorageCloudId, } as Storage, } as UploadParams); }} diff --git a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx index 7f231ba2aca..88a531e68a9 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx @@ -9,7 +9,7 @@ import { useSelector } from 'react-redux'; import Modal from 'antd/lib/modal'; import Alert from 'antd/lib/alert'; import Progress from 'antd/lib/progress'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; import { CombinedState } from 'reducers'; diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 23197bde268..a548fab02f3 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -21,8 +21,8 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { const { projectInstance } = props; const dispatch = useDispatch(); - const activeBackups = useSelector((state: CombinedState) => state.export.projects); - const exportIsActive = projectInstance.id in activeBackups; + const activeExports = useSelector((state: CombinedState) => state.export.projects); + const exportBackupIsActive = projectInstance.id in activeExports && activeExports[projectInstance.id].backup; const onDeleteProject = useCallback((): void => { Modal.confirm({ @@ -49,9 +49,9 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { Import dataset dispatch(exportActions.openExportModal(projectInstance, 'backup'))} - icon={exportIsActive && } + icon={exportBackupIsActive && } > Backup Project diff --git a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx index b49fe1f4232..c9f8c6e15b7 100644 --- a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx +++ b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx @@ -8,10 +8,10 @@ import notification from 'antd/lib/notification'; import AutoComplete from 'antd/lib/auto-complete'; import Input from 'antd/lib/input'; import { debounce } from 'lodash'; -import { CloudStorage } from 'reducers/interfaces'; +import { CloudStorage } from 'reducers'; import { AzureProvider, GoogleCloudProvider, S3Provider } from 'icons'; import { ProviderType } from 'utils/enums'; -import getCore from 'cvat-core-wrapper'; +import { getCore } from 'cvat-core-wrapper'; export interface Props { searchPhrase: string; cloudStorage: CloudStorage | null; diff --git a/cvat-ui/src/components/storage/source-storage-field.tsx b/cvat-ui/src/components/storage/source-storage-field.tsx index 96f843f9a12..2972adef596 100644 --- a/cvat-ui/src/components/storage/source-storage-field.tsx +++ b/cvat-ui/src/components/storage/source-storage-field.tsx @@ -4,7 +4,7 @@ import './styles.scss'; import React from 'react'; -import { Storage } from 'reducers/interfaces'; +import { Storage } from 'reducers'; import StorageWithSwitchField from './storage-with-switch-field'; export interface Props { diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index b051f451181..ea921ed948e 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -6,10 +6,8 @@ import './styles.scss'; import React, { useEffect, useState } from 'react'; import Select from 'antd/lib/select'; import Form from 'antd/lib/form'; -import { CloudStorage } from 'reducers/interfaces'; -import { StorageLocation } from 'reducers/interfaces'; +import { CloudStorage, Storage, StorageLocation } from 'reducers'; import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; -import { Storage } from 'reducers/interfaces'; const { Option } = Select; diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index cde12cff49d..1ba8a81241c 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -9,7 +9,7 @@ import Text from 'antd/lib/typography/Text'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; import StorageField from './storage-field'; -import { Storage } from 'reducers/interfaces'; +import { Storage } from 'reducers'; import Tooltip from 'antd/lib/tooltip'; import { QuestionCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; diff --git a/cvat-ui/src/components/storage/target-storage-field.tsx b/cvat-ui/src/components/storage/target-storage-field.tsx index 47cc80f3459..4aa598e11d9 100644 --- a/cvat-ui/src/components/storage/target-storage-field.tsx +++ b/cvat-ui/src/components/storage/target-storage-field.tsx @@ -4,7 +4,7 @@ import './styles.scss'; import React from 'react'; -import { Storage } from 'reducers/interfaces'; +import { Storage } from 'reducers'; import StorageWithSwitchField from './storage-with-switch-field'; diff --git a/cvat-ui/src/reducers/export-reducer.ts b/cvat-ui/src/reducers/export-reducer.ts index c94be9fc353..45e0cb425e3 100644 --- a/cvat-ui/src/reducers/export-reducer.ts +++ b/cvat-ui/src/reducers/export-reducer.ts @@ -60,7 +60,8 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor } } activities[instanceId].dataset = - instanceId in activities && !activities[instanceId].dataset.includes(format) ? + instanceId in activities && activities[instanceId].dataset + && !activities[instanceId].dataset.includes(format) ? [...activities[instanceId].dataset, format] : activities[instanceId]?.dataset || [format]; diff --git a/cvat-ui/src/reducers/import-backup-reducer.ts b/cvat-ui/src/reducers/import-backup-reducer.ts index 147ab8235e9..842e4c4aa62 100644 --- a/cvat-ui/src/reducers/import-backup-reducer.ts +++ b/cvat-ui/src/reducers/import-backup-reducer.ts @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT import { ImportBackupActions, ImportBackupActionTypes } from 'actions/import-backup-actions'; -import { ImportBackupState } from './interfaces'; +import { ImportBackupState } from '.'; const defaultState: ImportBackupState = { isTaskImported: false, From 2dc3959195b664ca286e23760e110fc3e6cfa00a Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 24 Aug 2022 20:38:18 +0200 Subject: [PATCH 11/60] Move file download process to job --- cvat/apps/engine/backup.py | 48 ++++++------- cvat/apps/engine/cloud_provider.py | 8 +++ cvat/apps/engine/utils.py | 25 +++++++ cvat/apps/engine/views.py | 105 ++++++++++++++--------------- 4 files changed, 106 insertions(+), 80 deletions(-) diff --git a/cvat/apps/engine/backup.py b/cvat/apps/engine/backup.py index 5f7c728503f..3458b5f6287 100644 --- a/cvat/apps/engine/backup.py +++ b/cvat/apps/engine/backup.py @@ -32,7 +32,7 @@ from cvat.apps.engine.serializers import (AttributeSerializer, DataSerializer, LabeledDataSerializer, SegmentSerializer, SimpleJobSerializer, TaskReadSerializer, ProjectReadSerializer, ProjectFileSerializer, TaskFileSerializer) -from cvat.apps.engine.utils import av_scan_paths +from cvat.apps.engine.utils import av_scan_paths, process_failed_job, configure_dependent_job from cvat.apps.engine.models import ( StorageChoice, StorageMethodChoice, DataChoice, Task, Project, Location, CloudStorage as CloudStorageModel) @@ -40,7 +40,7 @@ from cvat.apps.dataset_manager.views import TASK_CACHE_TTL, PROJECT_CACHE_TTL, get_export_cache_dir, clear_export_cache, log_exception from cvat.apps.dataset_manager.bindings import CvatImportError from cvat.apps.engine.cloud_provider import ( - db_storage_to_storage_instance, validate_bucket_status + db_storage_to_storage_instance, import_from_cloud_storage, export_to_cloud_storage ) from cvat.apps.engine.location import StorageType, get_location_configuration @@ -788,11 +788,6 @@ def export(db_instance, request): return sendfile(request, file_path, attachment=True, attachment_filename=filename) elif location == Location.CLOUD_STORAGE: - - @validate_bucket_status - def _export_to_cloud_storage(storage, file_path, file_name): - storage.upload_file(file_path, file_name) - try: storage_id = location_conf['storage_id'] except KeyError: @@ -802,7 +797,7 @@ def _export_to_cloud_storage(storage, file_path, file_name): db_storage = get_object_or_404(CloudStorageModel, pk=storage_id) storage = db_storage_to_storage_instance(db_storage) - _export_to_cloud_storage(storage, file_path, filename) + export_to_cloud_storage(storage, file_path, filename) return Response(status=status.HTTP_200_OK) else: raise NotImplementedError() @@ -826,6 +821,14 @@ def _export_to_cloud_storage(storage, file_path, file_name): result_ttl=ttl, failure_ttl=ttl) return Response(status=status.HTTP_202_ACCEPTED) + +def _download_file_from_bucket(db_storage, filename, key): + storage = db_storage_to_storage_instance(db_storage) + + data = import_from_cloud_storage(storage, key) + with open(filename, 'wb+') as f: + f.write(data.getbuffer()) + def _import(importer, request, rq_id, Serializer, file_field_name, location_conf, filename=None): queue = django_rq.get_queue("default") rq_job = queue.fetch_job(rq_id) @@ -845,14 +848,8 @@ def _import(importer, request, rq_id, Serializer, file_field_name, location_conf for chunk in payload_file.chunks(): f.write(chunk) else: - @validate_bucket_status - def _import_from_cloud_storage(storage, file_name): - return storage.download_fileobj(file_name) - file_name = request.query_params.get('filename') - assert file_name - - # download file from cloud storage + assert file_name, "The filename wasn't specified" try: storage_id = location_conf['storage_id'] except KeyError: @@ -860,13 +857,12 @@ def _import_from_cloud_storage(storage, file_name): 'Cloud storage location was selected for destination' ' but cloud storage id was not specified') db_storage = get_object_or_404(CloudStorageModel, pk=storage_id) - storage = db_storage_to_storage_instance(db_storage) - - data = _import_from_cloud_storage(storage, file_name) - + key = filename fd, filename = mkstemp(prefix='cvat_') - with open(filename, 'wb+') as f: - f.write(data.getbuffer()) + dependent_job = configure_dependent_job( + queue, rq_id, _download_file_from_bucket, + db_storage, filename, key) + rq_job = queue.enqueue_call( func=importer, args=(filename, request.user.id, org_id), @@ -875,6 +871,7 @@ def _import_from_cloud_storage(storage, file_name): 'tmp_file': filename, 'tmp_file_descriptor': fd, }, + depends_on=dependent_job ) else: if rq_job.is_finished: @@ -883,12 +880,9 @@ def _import_from_cloud_storage(storage, file_name): os.remove(rq_job.meta['tmp_file']) rq_job.delete() return Response({'id': project_id}, status=status.HTTP_201_CREATED) - elif rq_job.is_failed: - if rq_job.meta['tmp_file_descriptor']: os.close(rq_job.meta['tmp_file_descriptor']) - os.remove(rq_job.meta['tmp_file']) - exc_info = str(rq_job.exc_info) - rq_job.delete() - + elif rq_job.is_failed or \ + rq_job.is_deferred and rq_job.dependency and rq_job.dependency.is_failed: + exc_info = process_failed_job(rq_job) # RQ adds a prefix with exception class name import_error_prefix = '{}.{}'.format( CvatImportError.__module__, CvatImportError.__name__) diff --git a/cvat/apps/engine/cloud_provider.py b/cvat/apps/engine/cloud_provider.py index eb43c657a33..7135225cd17 100644 --- a/cvat/apps/engine/cloud_provider.py +++ b/cvat/apps/engine/cloud_provider.py @@ -648,3 +648,11 @@ def db_storage_to_storage_instance(db_storage): 'specific_attributes': db_storage.get_specific_attributes() } return get_cloud_storage_instance(cloud_provider=db_storage.provider_type, **details) + +@validate_bucket_status +def import_from_cloud_storage(storage, file_name): + return storage.download_fileobj(file_name) + +@validate_bucket_status +def export_to_cloud_storage(storage, file_path, file_name): + storage.upload_file(file_path, file_name) diff --git a/cvat/apps/engine/utils.py b/cvat/apps/engine/utils.py index a72bdfb909d..ead30d654fd 100644 --- a/cvat/apps/engine/utils.py +++ b/cvat/apps/engine/utils.py @@ -108,3 +108,28 @@ def parse_specific_attributes(specific_attributes): return { key: value for (key, value) in parsed_specific_attributes } if parsed_specific_attributes else dict() + + +def process_failed_job(rq_job): + if rq_job.meta['tmp_file_descriptor']: + os.close(rq_job.meta['tmp_file_descriptor']) + if os.path.exists(rq_job.meta['tmp_file']): + os.remove(rq_job.meta['tmp_file']) + exc_info = str(rq_job.exc_info) or str(rq_job.dependency.exc_info) + if rq_job.dependency: + rq_job.dependency.delete() + rq_job.delete() + + return exc_info + +def configure_dependent_job(queue, rq_id, rq_func, db_storage, filename, key): + rq_job_id_download_file = rq_id + f'?action=download_{filename}' + rq_job_download_file = queue.fetch_job(rq_job_id_download_file) + if not rq_job_download_file: + # note: boto3 resource isn't pickleable, so we can't use storage + rq_job_download_file = queue.enqueue_call( + func=rq_func, + args=(db_storage, filename, key), + job_id=rq_job_id_download_file + ) + return rq_job_download_file diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index 58d724a7a38..188ae745f66 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -44,7 +44,9 @@ import cvat.apps.dataset_manager as dm import cvat.apps.dataset_manager.views # pylint: disable=unused-import from cvat.apps.engine.cloud_provider import ( - db_storage_to_storage_instance, validate_bucket_status, Status as CloudStorageStatus) + db_storage_to_storage_instance, import_from_cloud_storage, export_to_cloud_storage, + Status as CloudStorageStatus +) from cvat.apps.dataset_manager.bindings import CvatImportError from cvat.apps.dataset_manager.serializers import DatasetFormatsSerializer from cvat.apps.engine.frame_provider import FrameProvider @@ -67,7 +69,7 @@ ProjectFileSerializer, TaskFileSerializer) from utils.dataset_manifest import ImageManifestManager -from cvat.apps.engine.utils import av_scan_paths +from cvat.apps.engine.utils import av_scan_paths, process_failed_job, configure_dependent_job from cvat.apps.engine import backup from cvat.apps.engine.mixins import UploadMixin, AnnotationMixin, SerializeMixin @@ -387,14 +389,16 @@ def dataset(self, request, pk): elif rq_job.is_finished: if rq_job.meta['tmp_file_descriptor']: os.close(rq_job.meta['tmp_file_descriptor']) os.remove(rq_job.meta['tmp_file']) + if rq_job.dependency: + rq_job.dependency.delete() rq_job.delete() return Response(status=status.HTTP_201_CREATED) - elif rq_job.is_failed: - if rq_job.meta['tmp_file_descriptor']: os.close(rq_job.meta['tmp_file_descriptor']) - os.remove(rq_job.meta['tmp_file']) - rq_job.delete() + elif rq_job.is_failed or \ + rq_job.is_deferred and rq_job.dependency and rq_job.dependency.is_failed: + exc_info = process_failed_job(rq_job) + return Response( - data=str(rq_job.exc_info), + data=str(exc_info), status=status.HTTP_500_INTERNAL_SERVER_ERROR ) else: @@ -1040,12 +1044,13 @@ def annotations(self, request, pk): elif request.method == 'PUT': format_name = request.query_params.get('format') if format_name: - return _import_annotations( + return self.import_annotations( request=request, - rq_id="{}@/api/tasks/{}/annotations/upload".format(request.user, pk), - rq_func=dm.task.import_task_annotations, pk=pk, - format_name=format_name, + db_obj=self._object, + import_func=_import_annotations, + rq_func=dm.task.import_task_annotations, + rq_id="{}@/api/tasks/{}/annotations/upload".format(request.user, pk) ) else: serializer = LabeledDataSerializer(data=request.data) @@ -1370,12 +1375,13 @@ def annotations(self, request, pk): elif request.method == 'PUT': format_name = request.query_params.get('format', '') if format_name: - return _import_annotations( + return self.import_annotations( request=request, - rq_id="{}@/api/jobs/{}/annotations/upload".format(request.user, pk), - rq_func=dm.task.import_job_annotations, pk=pk, - format_name=format_name + db_obj=self._object.segment.task, + import_func=_import_annotations, + rq_func=dm.task.import_job_annotations, + rq_id="{}@/api/jobs/{}/annotations/upload".format(request.user, pk) ) else: serializer = LabeledDataSerializer(data=request.data) @@ -2063,13 +2069,12 @@ def rq_handler(job, exc_type, exc_value, tb): return True -@validate_bucket_status -def _export_to_cloud_storage(storage, file_path, file_name): - storage.upload_file(file_path, file_name) +def _download_file_from_bucket(db_storage, filename, key): + storage = db_storage_to_storage_instance(db_storage) -@validate_bucket_status -def _import_from_cloud_storage(storage, file_name): - return storage.download_fileobj(file_name) + data = import_from_cloud_storage(storage, key) + with open(filename, 'wb+') as f: + f.write(data.getbuffer()) def _import_annotations(request, rq_id, rq_func, pk, format_name, filename=None, location_conf=None): @@ -2089,6 +2094,7 @@ def _import_annotations(request, rq_id, rq_func, pk, format_name, # Then we dont need to create temporary file # Or filename specify key in cloud storage so we need to download file fd = None + dependent_job = None location = location_conf.get('location') if location_conf else Location.LOCAL if not filename or location == Location.CLOUD_STORAGE: @@ -2101,28 +2107,26 @@ def _import_annotations(request, rq_id, rq_func, pk, format_name, for chunk in anno_file.chunks(): f.write(chunk) else: - # download annotation file from cloud storage + assert filename, 'The filename was not spesified' try: storage_id = location_conf['storage_id'] except KeyError: - raise serializer.ValidationError( + raise serializers.ValidationError( 'Cloud storage location was selected for destination' ' but cloud storage id was not specified') db_storage = get_object_or_404(CloudStorageModel, pk=storage_id) - storage = db_storage_to_storage_instance(db_storage) - assert filename, 'filename was not spesified' - - data = _import_from_cloud_storage(storage, filename) - - fd, filename = mkstemp(prefix='cvat_') - with open(filename, 'wb+') as f: - f.write(data.getbuffer()) + key = filename + fd, filename = mkstemp(prefix='cvat_{}'.format(pk)) + dependent_job = configure_dependent_job( + queue, rq_id, _download_file_from_bucket, + db_storage, filename, key) av_scan_paths(filename) rq_job = queue.enqueue_call( func=rq_func, args=(pk, filename, format_name), - job_id=rq_id + job_id=rq_id, + depends_on=dependent_job ) rq_job.meta['tmp_file'] = filename rq_job.meta['tmp_file_descriptor'] = fd @@ -2133,12 +2137,9 @@ def _import_annotations(request, rq_id, rq_func, pk, format_name, os.remove(rq_job.meta['tmp_file']) rq_job.delete() return Response(status=status.HTTP_201_CREATED) - elif rq_job.is_failed: - if rq_job.meta['tmp_file_descriptor']: os.close(rq_job.meta['tmp_file_descriptor']) - os.remove(rq_job.meta['tmp_file']) - exc_info = str(rq_job.exc_info) - rq_job.delete() - + elif rq_job.is_failed or \ + rq_job.is_deferred and rq_job.dependency and rq_job.dependency.is_failed: + exc_info = process_failed_job(rq_job) # RQ adds a prefix with exception class name import_error_prefix = '{}.{}'.format( CvatImportError.__module__, CvatImportError.__name__) @@ -2209,7 +2210,7 @@ def _export_annotations(db_instance, rq_id, request, format_name, action, callba db_storage = get_object_or_404(CloudStorageModel, pk=storage_id) storage = db_storage_to_storage_instance(db_storage) - _export_to_cloud_storage(storage, file_path, filename) + export_to_cloud_storage(storage, file_path, filename) return Response(status=status.HTTP_200_OK) else: raise NotImplementedError() @@ -2257,6 +2258,7 @@ def _import_project_dataset(request, rq_id, rq_func, pk, format_name, filename=N if not rq_job: fd = None + dependent_job = None location = location_conf.get('location') if location_conf else None if not filename and location != Location.CLOUD_STORAGE: serializer = DatasetFileSerializer(data=request.data) @@ -2267,9 +2269,7 @@ def _import_project_dataset(request, rq_id, rq_func, pk, format_name, filename=N for chunk in dataset_file.chunks(): f.write(chunk) elif location == Location.CLOUD_STORAGE: - assert filename - - # download project file from cloud storage + assert filename, 'The filename was not spesified' try: storage_id = location_conf['storage_id'] except KeyError: @@ -2277,23 +2277,22 @@ def _import_project_dataset(request, rq_id, rq_func, pk, format_name, filename=N 'Cloud storage location was selected for destination' ' but cloud storage id was not specified') db_storage = get_object_or_404(CloudStorageModel, pk=storage_id) - storage = db_storage_to_storage_instance(db_storage) - - data = _import_from_cloud_storage(storage, filename) - - fd, filename = mkstemp(prefix='cvat_') - with open(filename, 'wb+') as f: - f.write(data.getbuffer()) + key = filename + fd, filename = mkstemp(prefix='cvat_{}'.format(pk)) + dependent_job = configure_dependent_job( + queue, rq_id, _download_file_from_bucket, + db_storage, filename, key) rq_job = queue.enqueue_call( func=rq_func, args=(pk, filename, format_name), job_id=rq_id, meta={ - 'tmp_file': filename, - 'tmp_file_descriptor': fd, - }, - ) + 'tmp_file': filename, + 'tmp_file_descriptor': fd, + }, + depends_on=dependent_job + ) else: return Response(status=status.HTTP_409_CONFLICT, data='Import job already exists') From f1370dd09be4c90f61217a1d1fdf83ac737c8db3 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 24 Aug 2022 20:41:53 +0200 Subject: [PATCH 12/60] Rename methods --- cvat-core/src/project-implementation.ts | 8 ++++---- cvat-core/src/project.ts | 12 ++++++------ cvat-core/src/server-proxy.ts | 16 ++++++++-------- cvat-core/src/session.ts | 20 ++++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index 1d780b7b0de..ef0c70a8c06 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -90,17 +90,17 @@ export default function implementProject(projectClass) { return importDataset(this, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); }; - projectClass.prototype.export.implementation = async function ( + projectClass.prototype.backup.implementation = async function ( targetStorage: Storage, useDefaultSettings: boolean, fileName?: string ) { - const result = await serverProxy.projects.export(this.id, targetStorage, useDefaultSettings, fileName); + const result = await serverProxy.projects.backup(this.id, targetStorage, useDefaultSettings, fileName); return result; }; - projectClass.import.implementation = async function (storage: Storage, file: File | string) { - const result = await serverProxy.projects.import(storage, file); + projectClass.restore.implementation = async function (storage: Storage, file: File | string) { + const result = await serverProxy.projects.restore(storage, file); return result; }; diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index 7d2a68653b6..54336072f40 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -333,7 +333,7 @@ export default class Project { /** * Method makes a backup of a project - * @method export + * @method backup * @memberof module:API.cvat.classes.Project * @readonly * @instance @@ -342,10 +342,10 @@ export default class Project { * @throws {module:API.cvat.exceptions.PluginError} * @returns {string} URL to get result archive */ - async export(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + async backup(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { const result = await PluginRegistry.apiWrapper.call( this, - Project.prototype.export, + Project.prototype.backup, targetStorage, useDefaultSettings, fileName @@ -355,7 +355,7 @@ export default class Project { /** * Method restores a project from a backup - * @method import + * @method restore * @memberof module:API.cvat.classes.Project * @readonly * @instance @@ -364,8 +364,8 @@ export default class Project { * @throws {module:API.cvat.exceptions.PluginError} * @returns {number} ID of the imported project */ - static async import(storage: Storage, file: File | string) { - const result = await PluginRegistry.apiWrapper.call(this, Project.import, storage, file); + static async restore(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Project.restore, storage, file); return result; } } diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index bf0e5ae9dc8..f110f56990e 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -742,7 +742,7 @@ class ServerProxy { } } - async function exportTask(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + async function backupTask(id: number, targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { const { backendAPI } = config; const params: Params = { ...enableOrganization(), @@ -777,7 +777,7 @@ class ServerProxy { }); } - async function importTask(storage: Storage, file: File | string) { + async function restoreTask(storage: Storage, file: File | string) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request const params: Params = { @@ -845,7 +845,7 @@ class ServerProxy { return wait(taskData, response); } - async function exportProject( + async function backupProject( id: number, targetStorage: Storage, useDefaultSettings: boolean, @@ -887,7 +887,7 @@ class ServerProxy { }); } - async function importProject(storage: Storage, file: File | string) { + async function restoreProject(storage: Storage, file: File | string) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request const params: Params = { @@ -2061,8 +2061,8 @@ class ServerProxy { create: createProject, delete: deleteProject, exportDataset: exportDataset('projects'), - export: exportProject, - import: importProject, + export: backupProject, + import: restoreProject, importDataset, }), writable: false, @@ -2075,8 +2075,8 @@ class ServerProxy { create: createTask, delete: deleteTask, exportDataset: exportDataset('tasks'), - export: exportTask, - import: importTask, + export: backupTask, + import: restoreTask, }), writable: false, }, diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 9ee019925c9..70a36262496 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -1901,10 +1901,10 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - async export(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { + async backup(targetStorage: Storage, useDefaultSettings: boolean, fileName?: string) { const result = await PluginRegistry.apiWrapper.call( this, - Task.prototype.export, + Task.prototype.backup, targetStorage, useDefaultSettings, fileName @@ -1913,8 +1913,8 @@ export class Task extends Session { } /** - * Method imports a task from a backup - * @method import + * Method restores a task from a backup + * @method restore * @memberof module:API.cvat.classes.Task * @readonly * @instance @@ -1922,8 +1922,8 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ServerError} * @throws {module:API.cvat.exceptions.PluginError} */ - static async import(storage: Storage, file: File | string) { - const result = await PluginRegistry.apiWrapper.call(this, Task.import, storage, file); + static async restore(storage: Storage, file: File | string) { + const result = await PluginRegistry.apiWrapper.call(this, Task.restore, storage, file); return result; } } @@ -2413,18 +2413,18 @@ Task.prototype.delete.implementation = async function () { return result; }; -Task.prototype.export.implementation = async function ( +Task.prototype.backup.implementation = async function ( targetStorage: Storage, useDefaultSettings: boolean, fileName?: string ) { - const result = await serverProxy.tasks.export(this.id, targetStorage, useDefaultSettings, fileName); + const result = await serverProxy.tasks.backup(this.id, targetStorage, useDefaultSettings, fileName); return result; }; -Task.import.implementation = async function (storage: Storage, file: File | string) { +Task.restore.implementation = async function (storage: Storage, file: File | string) { // eslint-disable-next-line no-unsanitized/method - const result = await serverProxy.tasks.import(storage, file); + const result = await serverProxy.tasks.restore(storage, file); return result; }; From 1f885f47f93e81f5b8401111913969ad2e596127 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 24 Aug 2022 20:49:10 +0200 Subject: [PATCH 13/60] Small fix --- .../src/components/export-dataset/export-dataset-modal.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index bb2d9178ae4..519b92c3c95 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -140,11 +140,12 @@ function ExportDatasetModal(): JSX.Element | null { ), ); closeModal(); + const _resource = instanceType.includes('project') ? 'Dataset' : 'Annotations'; Notification.info({ - message: 'Dataset export started', + message: `${_resource} export started`, description: - `Dataset export was started for ${instanceType}. ` + - 'Download will start automatically as soon as the dataset is ready.', + `${_resource} export was started for ${instanceType}. ` + + `Download will start automatically as soon as the ${_resource} is ready.`, className: `cvat-notification-notice-export-${instanceType.split(' ')[0]}-start`, }); }, From 5c85dd6da4393129e093e21fafff0ce114ebbc2b Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 25 Aug 2022 00:12:32 +0200 Subject: [PATCH 14/60] Fix storages configuration for tasks --- .../advanced-configuration-form.tsx | 94 +++++++++---------- .../create-task-page/create-task-content.tsx | 24 +++++ 2 files changed, 71 insertions(+), 47 deletions(-) diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 9e58fa34aca..f6e24fbde43 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -16,7 +16,7 @@ import Text from 'antd/lib/typography/Text'; import { Store } from 'antd/lib/form/interface'; import CVATTooltip from 'components/common/cvat-tooltip'; import patterns from 'utils/validation-patterns'; -import { StorageLocation } from 'reducers'; +import { StorageLocation, Storage } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -51,8 +51,8 @@ export interface AdvancedConfiguration { sortingMethod: SortingMethod; useProjectSourceStorage: boolean | null; useProjectTargetStorage: boolean | null; - sourceStorage: any; - targetStorage: any; + sourceStorage: Storage; + targetStorage: Storage; } const initialValues: AdvancedConfiguration = { @@ -176,48 +176,15 @@ class AdvancedConfigurationForm extends React.PureComponent { public submit(): Promise { const { onSubmit, projectId } = this.props; + if (this.formRef.current) { - return this.formRef.current.validateFields().then( - (values: Store): Promise => { + if (projectId) { + return Promise.all([ + core.projects.get({ id: projectId }), + this.formRef.current.validateFields(), + ]).then(([getProjectResponse, values]) => { + const [project] = getProjectResponse; const frameFilter = values.frameStep ? `step=${values.frameStep}` : undefined; - let sourceStorage; - let targetStorage; - - const useProjectSourceStorage = values.useProjectSourceStorage; - const useProjectTargetStorage = values.useProjectTargetStorage; - - if (!!projectId) { - let projectSourceStorage; - let projectTargetStorage; - - if (useProjectSourceStorage || useProjectTargetStorage) { - core.projects.get({ id: projectId }).then((response: any) => { - if (response.length) { - const [project] = response; - projectSourceStorage = project.sourceStorage; - projectTargetStorage = project.targetStorage; - } - }); - } - - if (useProjectSourceStorage) { - sourceStorage = projectSourceStorage; - } - if (useProjectTargetStorage) { - targetStorage = projectTargetStorage; - } - } - if (!projectId || !useProjectSourceStorage) { - sourceStorage = { - ...values.sourceStorage, - } - } - if (!projectId || !useProjectTargetStorage) { - targetStorage = { - ...values.targetStorage, - } - } - const entries = Object.entries(values).filter( (entry: [string, unknown]): boolean => entry[0] !== frameFilter, ); @@ -225,12 +192,45 @@ class AdvancedConfigurationForm extends React.PureComponent { onSubmit({ ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), frameFilter, - sourceStorage, - targetStorage, + sourceStorage: values.useProjectSourceStorage ? { + // project.sourceStorage contains more properties than location and cloud_storage_id + location: project?.sourceStorage?.location, + cloud_storage_id: project?.sourceStorage?.cloud_storage_id, + } : { + ...values.sourceStorage, + }, + targetStorage: values.useProjectTargetStorage ? { + location: project?.targetStorage?.location, + cloud_storage_id: project?.targetStorage?.cloud_storage_id, + } : { + ...values.targetStorage, + }, }); return Promise.resolve(); - }, - ); + }) + } else { + return this.formRef.current.validateFields() + .then( + (values: Store): Promise => { + const frameFilter = values.frameStep ? `step=${values.frameStep}` : undefined; + const entries = Object.entries(values).filter( + (entry: [string, unknown]): boolean => entry[0] !== frameFilter, + ); + + onSubmit({ + ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), + frameFilter, + sourceStorage: { + ...values.sourceStorage, + }, + targetStorage: { + ...values.targetStorage, + }, + }); + return Promise.resolve(); + }, + ); + } } return Promise.reject(new Error('Form ref is empty')); diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index c840c6b49b3..63551599bd0 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -25,6 +25,10 @@ import AdvancedConfigurationForm, { AdvancedConfiguration, SortingMethod } from import { StorageLocation } from 'reducers'; +import { getCore } from 'cvat-core-wrapper'; + +const core = getCore(); + export interface CreateTaskData { projectId: number | null; basic: BaseConfiguration; @@ -220,6 +224,8 @@ class CreateTaskContent extends React.PureComponent => new Promise((resolve, reject) => { + const { projectId } = this.state; + if (!this.validateLabelsOrProject()) { notification.error({ message: 'Could not create a task', @@ -251,6 +257,24 @@ class CreateTaskContent extends React.PureComponent { + const [project] = response; + this.handleSubmitAdvancedConfiguration({ + ...this.state.advanced, + sourceStorage: { + location: project?.sourceStorage?.location, + cloud_storage_id: project?.sourceStorage?.cloud_storage_id, + }, + targetStorage: { + location: project?.targetStorage?.location, + cloud_storage_id: project?.targetStorage?.cloud_storage_id + }, + }); + return Promise.resolve(); + }) + } return Promise.resolve(); }) .then((): void => { From bf740dead4192366285903b9ccdf8840174348ee Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 25 Aug 2022 00:14:55 +0200 Subject: [PATCH 15/60] Styles --- .../create-project-page/create-project-content.tsx | 4 ++-- .../create-task-page/advanced-configuration-form.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index b7432310b69..a404f537754 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -145,13 +145,13 @@ function AdvancedConfigurationForm({ formRef }: { formRef: RefObject - + - + { {this.renderBugTracker()} - - {this.renderSourceStorage()} - {this.renderTargetStorage()} + + {this.renderSourceStorage()} + {this.renderTargetStorage()} ); From 8de7d8e42f7fa9de0db5f0f5d831b36e01afa4f8 Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 25 Aug 2022 10:41:01 +0200 Subject: [PATCH 16/60] Remove unused --- .../import-backup/import-backup-modal.tsx | 1 - .../src/components/import-backup/styles.scss | 32 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 cvat-ui/src/components/import-backup/styles.scss diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index f6f01bc768e..ee4aafb80b7 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -2,7 +2,6 @@ // // SPDX-License-Identifier: MIT -import './styles.scss'; import React, { useCallback, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import Modal from 'antd/lib/modal'; diff --git a/cvat-ui/src/components/import-backup/styles.scss b/cvat-ui/src/components/import-backup/styles.scss deleted file mode 100644 index ef72e86c280..00000000000 --- a/cvat-ui/src/components/import-backup/styles.scss +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2021-2022 Intel Corporation -// -// SPDX-License-Identifier: MIT - -@import '../../base.scss'; - -.cvat-modal-import-dataset-option-item > .ant-select-item-option-content, -.cvat-modal-import-select .ant-select-selection-item { - > span[role='img'] { - color: $info-icon-color; - margin-right: $grid-unit-size; - } -} - -.cvat-modal-import-header-question-icon { - margin-left: $grid-unit-size; - color: $text-color-secondary; -} - -.cvat-modal-import-dataset-status .ant-modal-body { - display: flex; - align-items: center; - flex-flow: column; - - .ant-progress { - margin-bottom: $grid-unit-size * 2; - } - - .ant-alert { - width: 100%; - } -} From 89084fdc832ca27a7f55639f1e119e8d1aae4453 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 26 Aug 2022 12:44:29 +0200 Subject: [PATCH 17/60] Change storage configuration && fix forms reset && some fixes --- cvat-core/src/annotations.ts | 2 +- cvat-core/src/interfaces.ts | 10 ---- cvat-core/src/project-implementation.ts | 6 +- cvat-core/src/project.ts | 17 +++++- cvat-core/src/server-proxy.ts | 12 ++-- cvat-core/src/session.ts | 23 +++++-- cvat-core/src/storage.ts | 55 +++++++++-------- cvat-ui/src/actions/export-actions.ts | 5 +- cvat-ui/src/actions/import-actions.ts | 9 ++- cvat-ui/src/actions/import-backup-actions.ts | 5 +- cvat-ui/src/actions/tasks-actions.ts | 9 ++- .../create-project-content.tsx | 49 ++++++++++++--- .../advanced-configuration-form.tsx | 53 ++++++++-------- .../create-task-page/create-task-content.tsx | 39 ++++++++---- .../export-backup/export-backup-modal.tsx | 29 ++++----- .../export-dataset/export-dataset-modal.tsx | 45 ++++++-------- .../import-backup/import-backup-modal.tsx | 31 +++++++--- .../import-dataset/import-dataset-modal.tsx | 60 ++++++++++--------- .../storage/source-storage-field.tsx | 12 +++- .../src/components/storage/storage-field.tsx | 27 ++++++--- .../storage/storage-with-switch-field.tsx | 13 +++- .../storage/target-storage-field.tsx | 13 ++-- cvat-ui/src/cvat-core-wrapper.ts | 3 + cvat-ui/src/reducers/index.ts | 5 -- 24 files changed, 314 insertions(+), 218 deletions(-) delete mode 100644 cvat-core/src/interfaces.ts diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index 67b533868c2..bcfa1571cff 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -12,7 +12,7 @@ const Project = require('./project').default; const { Task, Job } = require('./session'); const { ScriptingError, DataError, ArgumentError } = require('./exceptions'); const { getDeletedFrames } = require('./frames'); -import { Storage } from './interfaces'; +import { Storage } from './storage'; const jobCache = new WeakMap(); const taskCache = new WeakMap(); diff --git a/cvat-core/src/interfaces.ts b/cvat-core/src/interfaces.ts deleted file mode 100644 index c1fa5f0eeff..00000000000 --- a/cvat-core/src/interfaces.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (C) 2022 CVAT.ai Corporation -// -// SPDX-License-Identifier: MIT - -import { StorageLocation } from './enums'; - -export interface Storage { - location: StorageLocation; - cloudStorageId?: number; -} diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index ef0c70a8c06..d93bfaae877 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: MIT -import { Storage } from './interfaces'; +import { Storage } from './storage'; const serverProxy = require('./server-proxy').default; const { getPreview } = require('./frames'); @@ -46,11 +46,11 @@ export default function implementProject(projectClass) { } if (this.targetStorage) { - projectSpec.target_storage = this.targetStorage; + projectSpec.target_storage = this.targetStorage.toJSON(); } if (this.sourceStorage) { - projectSpec.source_storage = this.sourceStorage; + projectSpec.source_storage = this.sourceStorage.toJSON(); } const project = await serverProxy.projects.create(projectSpec); diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index 54336072f40..e21bb1cae33 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -3,7 +3,8 @@ // // SPDX-License-Identifier: MIT -import { Storage } from './interfaces'; +import { StorageLocation } from './enums'; +import { Storage } from './storage'; const PluginRegistry = require('./plugins').default; const { ArgumentError } = require('./exceptions'); @@ -253,7 +254,12 @@ export default class Project { * @instance */ sourceStorage: { - get: () => data.source_storage, + get: () => { + return new Storage({ + location: data.source_storage?.location || StorageLocation.LOCAL, + cloudStorageId: data.source_storage?.cloud_storage_id, + }); + }, }, /** * Target storage for export resources. @@ -264,7 +270,12 @@ export default class Project { * @instance */ targetStorage: { - get: () => data.target_storage, + get: () => { + return new Storage({ + location: data.target_storage?.location || StorageLocation.LOCAL, + cloudStorageId: data.target_storage?.cloud_storage_id, + }); + } }, _internalData: { get: () => data, diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index f110f56990e..07c5441a018 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -4,7 +4,7 @@ // SPDX-License-Identifier: MIT import { StorageLocation } from './enums'; -import { Storage } from './interfaces'; +import { Storage } from './storage'; type Params = { org: number | string, @@ -28,7 +28,7 @@ function enableOrganization() { return { org: config.organizationID || '' }; } -function configureStorage(storage: Storage = { location: StorageLocation.LOCAL }, useDefaultLocation: boolean = false) { +function configureStorage(storage: Storage, useDefaultLocation: boolean = false) { return { use_default_location: useDefaultLocation, ...(!useDefaultLocation ? { @@ -2061,8 +2061,8 @@ class ServerProxy { create: createProject, delete: deleteProject, exportDataset: exportDataset('projects'), - export: backupProject, - import: restoreProject, + backup: backupProject, + restore: restoreProject, importDataset, }), writable: false, @@ -2075,8 +2075,8 @@ class ServerProxy { create: createTask, delete: deleteTask, exportDataset: exportDataset('tasks'), - export: backupTask, - import: restoreTask, + backup: backupTask, + restore: restoreTask, }), writable: false, }, diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 70a36262496..dd201fb3c2b 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -3,7 +3,8 @@ // // SPDX-License-Identifier: MIT -import { Storage } from './interfaces'; +import { StorageLocation } from './enums'; +import { Storage } from './storage'; const PluginRegistry = require('./plugins').default; const loggerStorage = require('./logger-storage'); @@ -1769,7 +1770,12 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ArgumentError} */ sourceStorage: { - get: () => data.source_storage, + get: () => { + return new Storage({ + location: data.source_storage?.location || StorageLocation.LOCAL, + cloudStorageId: data.source_storage?.cloud_storage_id, + }); + }, }, /** * Target storage for export resources. @@ -1780,7 +1786,12 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ArgumentError} */ targetStorage: { - get: () => data.target_storage, + get: () => { + return new Storage({ + location: data.target_storage?.location || StorageLocation.LOCAL, + cloudStorageId: data.target_storage?.cloud_storage_id, + }); + }, }, _internalData: { get: () => data, @@ -1893,7 +1904,7 @@ export class Task extends Session { /** * Method makes a backup of a task - * @method export + * @method backup * @memberof module:API.cvat.classes.Task * @readonly * @instance @@ -2368,11 +2379,11 @@ Task.prototype.save.implementation = async function (onUpdate) { } if (this.targetStorage) { - taskSpec.target_storage = this.targetStorage; + taskSpec.target_storage = this.targetStorage.toJSON(); } if (this.sourceStorage) { - taskSpec.source_storage = this.sourceStorage; + taskSpec.source_storage = this.sourceStorage.toJSON(); } const taskDataSpec = { diff --git a/cvat-core/src/storage.ts b/cvat-core/src/storage.ts index 1d3e90b075a..f5b5c5ca8e3 100644 --- a/cvat-core/src/storage.ts +++ b/cvat-core/src/storage.ts @@ -2,29 +2,33 @@ // // SPDX-License-Identifier: MIT -import { StorageLocation } from 'enums'; +import { StorageLocation } from './enums'; + +export interface StorageData { + location: StorageLocation; + cloudStorageId?: number; +} + +interface StorageJsonData { + location: StorageLocation; + cloud_storage_id?: number; +} /** * Class representing a storage for import and export resources * @memberof module:API.cvat.classes * @hideconstructor */ -export default class Storage { +export class Storage { public location: StorageLocation; public cloudStorageId: number; - constructor(initialData) { - const data = { - location: undefined, - cloud_storage_id: undefined, + + constructor(initialData: StorageData) { + const data: StorageData = { + location: initialData.location, + cloudStorageId: initialData?.cloudStorageId, }; - for (const key in data) { - if (Object.prototype.hasOwnProperty.call(data, key)) { - if (Object.prototype.hasOwnProperty.call(initialData, key)) { - data[key] = initialData[key]; - } - } - } Object.defineProperties( this, @@ -34,31 +38,30 @@ export default class Storage { * @type {module:API.cvat.enums.StorageLocation} * @memberof module:API.cvat.classes.Storage * @instance - * @throws {module:API.cvat.exceptions.ArgumentError} + * @readonly */ location: { - get: () => data.location, - set: (key) => { - if (key !== undefined && !!StorageLocation[key]) { - data.location = StorageLocation[key]; - } else { - throw new ArgumentError('Value must be one of the StorageLocation keys'); - } - }, + get: () => data.location }, /** * @name cloudStorageId * @type {number} * @memberof module:API.cvat.classes.Storage * @instance + * @readonly */ cloudStorageId: { - get: () => data.cloud_storage_id, - set: (cloudStorageId) => { - data.cloud_storage_id = cloudStorageId; - }, + get: () => data.cloudStorageId }, }), ); } + toJSON(): StorageJsonData { + return { + location: this.location, + ...(this.cloudStorageId ? { + cloud_storage_id: this.cloudStorageId, + } : {}) + }; + } } \ No newline at end of file diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index e03ac870ad0..45ff052cd8e 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -4,9 +4,8 @@ // SPDX-License-Identifier: MIT import { ActionUnion, createAction, ThunkAction } from 'utils/redux'; -import { Storage } from 'reducers'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage } from 'cvat-core-wrapper'; const core = getCore(); @@ -78,7 +77,7 @@ export const exportBackupAsync = (instance: any, targetStorage: Storage, useDefa const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; try { - const result = await instance.export(targetStorage, useDefaultSetting, fileName); + const result = await instance.backup(targetStorage, useDefaultSetting, fileName); if (result) { const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; downloadAnchor.href = result; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 358b4f01221..ca9a686fd01 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -6,8 +6,7 @@ import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; import { CombinedState } from 'reducers'; import { getProjectsAsync } from './projects-actions'; -import { Storage } from 'reducers'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage } from 'cvat-core-wrapper'; import { LogType } from 'cvat-logger'; import { jobInfoGenerator, receiveAnnotationsParameters, AnnotationActionTypes } from 'actions/annotation-actions'; @@ -95,9 +94,9 @@ export const importDatasetAsync = ( await instance.actions.clear(); const history = await instance.actions.get(); - // // One more update to escape some problems - // // in canvas when shape with the same - // // clientID has different type (polygon, rectangle) for example + // One more update to escape some problems + // in canvas when shape with the same + // clientID has different type (polygon, rectangle) for example dispatch({ type: AnnotationActionTypes.UPLOAD_JOB_ANNOTATIONS_SUCCESS, payload: { diff --git a/cvat-ui/src/actions/import-backup-actions.ts b/cvat-ui/src/actions/import-backup-actions.ts index ded4d547fe4..c2436e952cb 100644 --- a/cvat-ui/src/actions/import-backup-actions.ts +++ b/cvat-ui/src/actions/import-backup-actions.ts @@ -3,8 +3,7 @@ // SPDX-License-Identifier: MIT import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; -import { Storage } from 'reducers'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage } from 'cvat-core-wrapper'; const core = getCore(); @@ -35,7 +34,7 @@ export const importBackupAsync = (instanceType: 'project' | 'task', storage: Sto dispatch(importBackupActions.importBackup()); try { const inctanceClass = (instanceType === 'task') ? core.classes.Task : core.classes.Project; - const instance = await inctanceClass.import(storage, file); + const instance = await inctanceClass.restore(storage, file); dispatch(importBackupActions.importBackupSuccess(instance.id, instanceType)); } catch (error) { dispatch(importBackupActions.importBackupFailed(instanceType, error)); diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index 41bff8b43d0..689e6d4f998 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -5,9 +5,8 @@ import { AnyAction, Dispatch, ActionCreator } from 'redux'; import { ThunkAction } from 'redux-thunk'; -import { TasksQuery, CombinedState, Indexable } from 'reducers'; -import { getCVATStore } from 'cvat-store'; -import { getCore } from 'cvat-core-wrapper'; +import { TasksQuery, CombinedState, Indexable, StorageLocation } from 'reducers'; +import { getCore, Storage } from 'cvat-core-wrapper'; import { getInferenceStatusAsync } from './models-actions'; const cvat = getCore(); @@ -194,8 +193,8 @@ export function createTaskAsync(data: any): ThunkAction, {}, {}, A use_zip_chunks: data.advanced.useZipChunks, use_cache: data.advanced.useCache, sorting_method: data.advanced.sortingMethod, - source_storage: data.advanced.sourceStorage, - target_storage: data.advanced.targetStorage, + source_storage: new Storage(data.advanced.sourceStorage || { location: StorageLocation.LOCAL }).toJSON(), + target_storage: new Storage(data.advanced.targetStorage || { location: StorageLocation.LOCAL }).toJSON(), }; if (data.projectId) { diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index a404f537754..6a8beade97a 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -26,11 +26,13 @@ import { StorageLocation } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; +import { Storage, StorageData } from 'cvat-core-wrapper'; + const { Option } = Select; interface AdvancedConfiguration { - sourceStorage: any; - targetStorage: any; + sourceStorage: StorageData; + targetStorage: StorageData; bug_tracker?: string | null; } @@ -38,14 +40,22 @@ const initialValues: AdvancedConfiguration = { bug_tracker: null, sourceStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, }, targetStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, }, }; +interface AdvancedConfigurationProps { + formRef: RefObject; + sourceStorageLocation: StorageLocation; + targetStorageLocation: StorageLocation; + onChangeSourceStorageLocation?: (value: StorageLocation) => void; + onChangeTargetStorageLocation?: (value: StorageLocation) => void; +} + function NameConfigurationForm( { formRef, inputRef }: { formRef: RefObject, inputRef: RefObject }, @@ -122,8 +132,15 @@ function AdaptiveAutoAnnotationForm({ formRef }: { formRef: RefObject }): JSX.Element { - return ( +function AdvancedConfigurationForm(props: AdvancedConfigurationProps): JSX.Element { + const { + formRef, + sourceStorageLocation, + targetStorageLocation, + onChangeSourceStorageLocation, + onChangeTargetStorageLocation, + } = props; + return (
    @@ -164,6 +185,8 @@ function AdvancedConfigurationForm({ formRef }: { formRef: RefObject([]); + const [sourceStorageLocation, setSourceStorageLocation] = useState(StorageLocation.LOCAL); + const [targetStorageLocation, setTargetStorageLocation] = useState(StorageLocation.LOCAL); const nameFormRef = useRef(null); const nameInputRef = useRef(null); const adaptiveAutoAnnotationFormRef = useRef(null); @@ -177,6 +200,8 @@ export default function CreateProjectContent(): JSX.Element { if (nameFormRef.current) nameFormRef.current.resetFields(); if (advancedFormRef.current) advancedFormRef.current.resetFields(); setProjectLabels([]); + setSourceStorageLocation(StorageLocation.LOCAL); + setTargetStorageLocation(StorageLocation.LOCAL); }; const focusForm = (): void => { @@ -195,8 +220,8 @@ export default function CreateProjectContent(): JSX.Element { ...projectData, ...advancedValues, name: basicValues.name, - source_storage: advancedValues?.sourceStorage, - target_storage: advancedValues?.targetStorage, + source_storage: new Storage(advancedValues.sourceStorage || { location: StorageLocation.LOCAL }).toJSON(), + target_storage: new Storage(advancedValues.targetStorage || { location: StorageLocation.LOCAL }).toJSON(), }; if (adaptiveAutoAnnotationValues) { @@ -258,7 +283,13 @@ export default function CreateProjectContent(): JSX.Element { Advanced configuration}> - + setSourceStorageLocation(value)} + onChangeTargetStorageLocation={(value: StorageLocation) => setTargetStorageLocation(value)} + /> diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index a9d00b909ca..64317b5c6e8 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -16,11 +16,11 @@ import Text from 'antd/lib/typography/Text'; import { Store } from 'antd/lib/form/interface'; import CVATTooltip from 'components/common/cvat-tooltip'; import patterns from 'utils/validation-patterns'; -import { StorageLocation, Storage } from 'reducers'; +import { StorageLocation } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage, StorageData } from 'cvat-core-wrapper'; const core = getCore(); @@ -51,8 +51,8 @@ export interface AdvancedConfiguration { sortingMethod: SortingMethod; useProjectSourceStorage: boolean | null; useProjectTargetStorage: boolean | null; - sourceStorage: Storage; - targetStorage: Storage; + sourceStorage: StorageData; + targetStorage: StorageData; } const initialValues: AdvancedConfiguration = { @@ -67,11 +67,11 @@ const initialValues: AdvancedConfiguration = { sourceStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, }, targetStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, } }; @@ -79,12 +79,16 @@ interface Props { onSubmit(values: AdvancedConfiguration): void; onChangeUseProjectSourceStorage(value: boolean): void; onChangeUseProjectTargetStorage(value: boolean): void; + onChangeSourceStorageLocation: (value: StorageLocation) => void; + onChangeTargetStorageLocation: (value: StorageLocation) => void; installedGit: boolean; projectId: number | null; useProjectSourceStorage?: boolean | null; useProjectTargetStorage?: boolean | null; activeFileManagerTab: string; - dumpers: [] + dumpers: []; + sourceStorageLocation: StorageLocation; + targetStorageLocation: StorageLocation; } function validateURL(_: RuleObject, value: string): Promise { @@ -192,19 +196,12 @@ class AdvancedConfigurationForm extends React.PureComponent { onSubmit({ ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), frameFilter, - sourceStorage: values.useProjectSourceStorage ? { - // project.sourceStorage contains more properties than location and cloud_storage_id - location: project?.sourceStorage?.location, - cloud_storage_id: project?.sourceStorage?.cloud_storage_id, - } : { - ...values.sourceStorage, - }, - targetStorage: values.useProjectTargetStorage ? { - location: project?.targetStorage?.location, - cloud_storage_id: project?.targetStorage?.cloud_storage_id, - } : { - ...values.targetStorage, - }, + sourceStorage: values.useProjectSourceStorage ? + new Storage(project.sourceStorage || { location: StorageLocation.LOCAL }) + : new Storage(values.sourceStorage), + targetStorage: values.useProjectTargetStorage ? + new Storage(project.targetStorage || { location: StorageLocation.LOCAL }) + : new Storage(values.targetStorage), }); return Promise.resolve(); }) @@ -220,12 +217,8 @@ class AdvancedConfigurationForm extends React.PureComponent { onSubmit({ ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), frameFilter, - sourceStorage: { - ...values.sourceStorage, - }, - targetStorage: { - ...values.targetStorage, - }, + sourceStorage: new Storage(values.sourceStorage), + targetStorage: new Storage(values.targetStorage), }); return Promise.resolve(); }, @@ -506,15 +499,19 @@ class AdvancedConfigurationForm extends React.PureComponent { const { projectId, useProjectSourceStorage, + sourceStorageLocation, onChangeUseProjectSourceStorage, + onChangeSourceStorageLocation, } = this.props; return ( ); } @@ -523,15 +520,19 @@ class AdvancedConfigurationForm extends React.PureComponent { const { projectId, useProjectTargetStorage, + targetStorageLocation, onChangeUseProjectTargetStorage, + onChangeTargetStorageLocation, } = this.props; return ( ); } diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index 63551599bd0..b4cf85b3bb5 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -25,7 +25,7 @@ import AdvancedConfigurationForm, { AdvancedConfiguration, SortingMethod } from import { StorageLocation } from 'reducers'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage, StorageData } from 'cvat-core-wrapper'; const core = getCore(); @@ -64,11 +64,11 @@ const defaultState = { sortingMethod: SortingMethod.LEXICOGRAPHICAL, sourceStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, }, targetStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: null, + cloudStorageId: undefined, }, useProjectSourceStorage: true, useProjectTargetStorage: true, @@ -263,14 +263,8 @@ class CreateTaskContent extends React.PureComponent ({ + advanced: { + ...state.advanced, + [field]: { + location: value, + } + } + })); + } + private renderAdvancedBlock(): JSX.Element { const { installedGit, dumpers } = this.props; const { activeFileManagerTab, projectId } = this.state; - const { useProjectSourceStorage, useProjectTargetStorage } = this.state.advanced; + const {useProjectSourceStorage, useProjectTargetStorage } = this.state.advanced; + const { location: sourceStorageLocation } = this.state.advanced.sourceStorage; + const { location: targetStorageLocation } = this.state.advanced.targetStorage; return ( @@ -412,8 +419,16 @@ class CreateTaskContent extends React.PureComponent { + this.handleChangeStorageLocation('sourceStorage', value); + }} + onChangeTargetStorageLocation={(value: StorageLocation) => { + this.handleChangeStorageLocation('targetStorage', value); + }} /> diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index eba08cdaa8c..b32860a0c68 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -12,9 +12,9 @@ import Text from 'antd/lib/typography/Text'; import Input from 'antd/lib/input'; import Form from 'antd/lib/form'; -import { CombinedState, Storage } from 'reducers'; +import { CombinedState, StorageLocation } from 'reducers'; import { exportActions, exportBackupAsync } from 'actions/export-actions'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage, StorageData } from 'cvat-core-wrapper'; import TargetStorageField from 'components/storage/target-storage-field'; @@ -22,15 +22,15 @@ const core = getCore(); type FormValues = { customName: string | undefined; - targetStorage: any; + targetStorage: StorageData; useProjectTargetStorage: boolean; }; const initialValues: FormValues = { customName: undefined, targetStorage: { - location: undefined, - cloud_storage_id: undefined, + location: StorageLocation.LOCAL, + cloudStorageId: undefined, }, useProjectTargetStorage: true, } @@ -41,7 +41,8 @@ function ExportBackupModal(): JSX.Element | null { const [instanceType, setInstanceType] = useState(''); const [activity, setActivity] = useState(false); const [useDefaultStorage, setUseDefaultStorage] = useState(true); - const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); + const [storageLocation, setStorageLocation] = useState(StorageLocation.LOCAL); + const [defaultStorageLocation, setDefaultStorageLocation] = useState(StorageLocation.LOCAL); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); const [helpMessage, setHelpMessage] = useState(''); const resource = useSelector((state: CombinedState) => state.export.resource); @@ -74,11 +75,8 @@ function ExportBackupModal(): JSX.Element | null { useEffect(() => { if (instance && resource === 'backup') { - setDefaultStorageLocation((instance.targetStorage) ? - instance.targetStorage.location : null); - setDefaultStorageCloudId((instance.targetStorage) ? - instance.targetStorage.cloud_storage_id - : null); + setDefaultStorageLocation(instance.targetStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(instance.targetStorage?.cloudStorageId || null); } }, [instance?.id, resource, instance?.targetStorage]); @@ -90,6 +88,7 @@ function ExportBackupModal(): JSX.Element | null { const closeModal = (): void => { setUseDefaultStorage(true); + setStorageLocation(StorageLocation.LOCAL); form.resetFields(); dispatch(exportActions.closeExportModal()); }; @@ -99,10 +98,10 @@ function ExportBackupModal(): JSX.Element | null { dispatch( exportBackupAsync( instance, - { + new Storage({ location: useDefaultStorage ? defaultStorageLocation : values.targetStorage?.location, - cloudStorageId: useDefaultStorage ? defaultStorageCloudId : values.targetStorage?.cloud_storage_id, - } as Storage, + cloudStorageId: useDefaultStorage ? defaultStorageCloudId : values.targetStorage?.cloudStorageId, + }), useDefaultStorage, values.customName ? `${values.customName}.zip` : undefined ), @@ -152,7 +151,9 @@ function ExportBackupModal(): JSX.Element | null { switchHelpMessage={helpMessage} useProjectStorage={useDefaultStorage} storageDescription={`Specify target storage for export ${instanceType}`} + locationValue={storageLocation} onChangeUseProjectStorage={(value: boolean) => setUseDefaultStorage(value)} + onChangeLocationValue={(value: StorageLocation) => setStorageLocation(value)} /> diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 519b92c3c95..73eb5d9ec23 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -16,9 +16,9 @@ import Form from 'antd/lib/form'; import Switch from 'antd/lib/switch'; import Space from 'antd/lib/space'; import TargetStorageField from 'components/storage/target-storage-field'; -import { CombinedState, Storage, StorageLocation } from 'reducers'; +import { CombinedState, StorageLocation } from 'reducers'; import { exportActions, exportDatasetAsync } from 'actions/export-actions'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage, StorageData } from 'cvat-core-wrapper'; const core = getCore(); @@ -26,7 +26,7 @@ type FormValues = { selectedFormat: string | undefined; saveImages: boolean; customName: string | undefined; - targetStorage: any; + targetStorage: StorageData; useProjectTargetStorage: boolean; }; @@ -36,7 +36,7 @@ const initialValues: FormValues = { customName: undefined, targetStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: undefined, + cloudStorageId: undefined, }, useProjectTargetStorage: true, } @@ -46,10 +46,10 @@ function ExportDatasetModal(): JSX.Element | null { const [activities, setActivities] = useState([]); const [useDefaultTargetStorage, setUseDefaultTargetStorage] = useState(true); const [form] = Form.useForm(); - const [targetStorage, setTargetStorage] = useState({ + const [targetStorage, setTargetStorage] = useState({ location: StorageLocation.LOCAL, }); - const [defaultStorageLocation, setDefaultStorageLocation] = useState(null); + const [defaultStorageLocation, setDefaultStorageLocation] = useState(StorageLocation.LOCAL); const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); const [helpMessage, setHelpMessage] = useState(''); const dispatch = useDispatch(); @@ -91,20 +91,14 @@ function ExportDatasetModal(): JSX.Element | null { useEffect(() => { if (instance && resource === 'dataset') { if (instance instanceof core.classes.Project || instance instanceof core.classes.Task) { - setDefaultStorageLocation((instance.targetStorage) ? - instance.targetStorage.location : null); - setDefaultStorageCloudId((instance.targetStorage) ? - instance.targetStorage.cloud_storage_id - : null); + setDefaultStorageLocation(instance.targetStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(instance.targetStorage?.cloudStorageId || null); } else { core.tasks.get({ id: instance.taskId }).then((response: any) => { if (response.length) { const [taskInstance] = response; - setDefaultStorageLocation((taskInstance.targetStorage) ? - taskInstance.targetStorage.location : null); - setDefaultStorageCloudId((taskInstance.targetStorage) ? - taskInstance.targetStorage.cloud_storage_id - : null); + setDefaultStorageLocation(taskInstance.targetStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(taskInstance.targetStorage?.cloudStorageId || null); } }); } @@ -119,6 +113,7 @@ function ExportDatasetModal(): JSX.Element | null { const closeModal = (): void => { setUseDefaultTargetStorage(true); + setTargetStorage({ location: StorageLocation.LOCAL }); form.resetFields(); dispatch(exportActions.closeExportModal()); }; @@ -132,10 +127,10 @@ function ExportDatasetModal(): JSX.Element | null { values.selectedFormat as string, values.saveImages, useDefaultTargetStorage, - useDefaultTargetStorage ? { + useDefaultTargetStorage ? new Storage({ location: defaultStorageLocation, - cloud_storage_id: defaultStorageCloudId, - }: targetStorage, + cloudStorageId: defaultStorageCloudId, + }): new Storage(targetStorage), values.customName ? `${values.customName}.zip` : null, ), ); @@ -152,12 +147,6 @@ function ExportDatasetModal(): JSX.Element | null { [instance, instanceType, targetStorage], ); - const onChangeTargetStorage = (value: Storage): void => { - setTargetStorage({ - ...value, - } as Storage) - } - if (resource !== 'dataset') { return null; } @@ -228,8 +217,12 @@ function ExportDatasetModal(): JSX.Element | null { switchHelpMessage={helpMessage} useProjectStorage={useDefaultTargetStorage} storageDescription='Specify target storage for export dataset' + locationValue={targetStorage.location} onChangeUseProjectStorage={(value: boolean) => setUseDefaultTargetStorage(value)} - onChangeStorage={(value: Storage) => onChangeTargetStorage(value)} + onChangeStorage={(value: StorageData) => setTargetStorage(value)} + onChangeLocationValue={(value: StorageLocation) => { + setTargetStorage({ location: value }); + }} /> diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index ee4aafb80b7..a2bc984c515 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -11,21 +11,23 @@ import Notification from 'antd/lib/notification'; import message from 'antd/lib/message'; import Upload, { RcFile } from 'antd/lib/upload'; import { InboxOutlined } from '@ant-design/icons'; -import { CombinedState, Storage, StorageLocation } from 'reducers'; +import { CombinedState, StorageLocation } from 'reducers'; import { importBackupActions, importBackupAsync } from 'actions/import-backup-actions'; import SourceStorageField from 'components/storage/source-storage-field'; import Input from 'antd/lib/input/Input'; +import { Storage, StorageData } from 'cvat-core-wrapper'; + type FormValues = { fileName?: string | undefined; - sourceStorage: any; + sourceStorage: StorageData; }; const initialValues: FormValues = { fileName: undefined, sourceStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: undefined, + cloudStorageId: undefined, } } @@ -35,7 +37,9 @@ function ImportBackupModal(): JSX.Element { const instanceType = useSelector((state: CombinedState) => state.importBackup?.instanceType); const modalVisible = useSelector((state: CombinedState) => state.importBackup.modalVisible); const dispatch = useDispatch(); - const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); + const [selectedSourceStorage, setSelectedSourceStorage] = useState({ + location: StorageLocation.LOCAL, + }); const uploadLocalFile = (): JSX.Element => { return ( @@ -90,6 +94,9 @@ function ImportBackupModal(): JSX.Element { const closeModal = useCallback((): void => { form.resetFields(); + setSelectedSourceStorage({ + location: StorageLocation.LOCAL, + }); setFile(null); dispatch(importBackupActions.closeImportModal()); }, [form, instanceType]); @@ -102,10 +109,10 @@ function ImportBackupModal(): JSX.Element { }); return; } - const sourceStorage = { + const sourceStorage = new Storage({ location: values.sourceStorage.location, - cloudStorageId: values.sourceStorage.cloud_storage_id, - } as Storage; + cloudStorageId: values.sourceStorage?.cloudStorageId, + }); dispatch(importBackupAsync(instanceType, sourceStorage, file || (values.fileName) as string)); @@ -115,7 +122,6 @@ function ImportBackupModal(): JSX.Element { }); closeModal(); }, - // another dependensis like instance type [instanceType, file], ); @@ -139,7 +145,14 @@ function ImportBackupModal(): JSX.Element { setSelectedSourceStorage(value)} + locationValue={selectedSourceStorage.location} + onChangeStorage={(value: StorageData) => setSelectedSourceStorage(new Storage(value))} + onChangeLocationValue={(value: StorageLocation) => { + setSelectedSourceStorage({ + location: value, + }); + }} + /> {selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} {selectedSourceStorage?.location === StorageLocation.LOCAL && uploadLocalFile()} diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index a536753bf7b..59394ee4e64 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -17,12 +17,12 @@ import { UploadOutlined, InboxOutlined, LoadingOutlined, QuestionCircleOutlined, } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; -import { CombinedState, Storage, StorageLocation } from 'reducers'; +import { CombinedState, StorageLocation } from 'reducers'; import { importActions, importDatasetAsync } from 'actions/import-actions'; import ImportDatasetStatusModal from './import-dataset-status-modal'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; -import { getCore } from 'cvat-core-wrapper'; +import { getCore, Storage, StorageData } from 'cvat-core-wrapper'; import StorageField from 'components/storage/storage-field'; import Input from 'antd/lib/input/Input'; @@ -33,7 +33,7 @@ const core = getCore(); type FormValues = { selectedFormat: string | undefined; fileName?: string | undefined; - sourceStorage: any; + sourceStorage: StorageData; useDefaultSettings: boolean; }; @@ -42,7 +42,7 @@ const initialValues: FormValues = { fileName: undefined, sourceStorage: { location: StorageLocation.LOCAL, - cloud_storage_id: undefined, + cloudStorageId: undefined, }, useDefaultSettings: true, } @@ -63,10 +63,10 @@ function ImportDatasetModal(): JSX.Element | null { const [file, setFile] = useState(null); const [selectedLoader, setSelectedLoader] = useState(null); const [useDefaultSettings, setUseDefaultSettings] = useState(true); - const [defaultStorageLocation, setDefaultStorageLocation] = useState(''); - const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(null); + const [defaultStorageLocation, setDefaultStorageLocation] = useState(StorageLocation.LOCAL); + const [defaultStorageCloudId, setDefaultStorageCloudId] = useState(undefined); const [helpMessage, setHelpMessage] = useState(''); - const [selectedSourceStorage, setSelectedSourceStorage] = useState(null); + const [selectedSourceStorageLocation, setSelectedSourceStorageLocation] = useState(StorageLocation.LOCAL); const [uploadParams, setUploadParams] = useState({ useDefaultSettings: true, } as UploadParams); @@ -109,26 +109,27 @@ function ImportDatasetModal(): JSX.Element | null { useEffect(() => { if (instance && modalVisible) { if (instance instanceof core.classes.Project || instance instanceof core.classes.Task) { - setDefaultStorageLocation((instance.sourceStorage) ? - instance.sourceStorage.location : null); - setDefaultStorageCloudId((instance.sourceStorage) ? - instance.sourceStorage.cloud_storage_id - : null); + setDefaultStorageLocation(instance.sourceStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(instance.sourceStorage?.cloudStorageId || null); if (instance instanceof core.classes.Project) { setInstanceType(`project #${instance.id}`); } else { setInstanceType(`task #${instance.id}`); } } else if (instance instanceof core.classes.Job) { - core.tasks.get({ id: instance.taskId }).then((response: any) => { + core.tasks.get({ id: instance.taskId }) + .then((response: any) => { if (response.length) { const [taskInstance] = response; - setDefaultStorageLocation((taskInstance.sourceStorage) ? - taskInstance.sourceStorage.location : null); - setDefaultStorageCloudId((taskInstance.sourceStorage) ? - taskInstance.sourceStorage.cloud_storage_id - : null); + setDefaultStorageLocation(taskInstance.sourceStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(taskInstance.sourceStorage?.cloudStorageId || null); } + }) + .catch((error: Error) => { + Notification.error({ + message: `Could not get task instance ${instance.taskId}`, + description: error.toString(), + }); }); setInstanceType(`job #${instance.id}`); } @@ -208,6 +209,7 @@ function ImportDatasetModal(): JSX.Element | null { hasFeedback dependencies={['selectedFormat']} rules={[{ validator: validateFileName }]} + required > { setUseDefaultSettings(true); + setSelectedSourceStorageLocation(StorageLocation.LOCAL); form.resetFields(); setFile(null); dispatch(importActions.closeImportModal(instance)); @@ -287,7 +290,7 @@ function ImportDatasetModal(): JSX.Element | null { - Import {resource} to {instanceType} + Import {resource} to {instanceType} { instance instanceof core.classes.Project && { - setSelectedSourceStorage(value); + selectCloudStorageName={['sourceStorage', 'cloudStorageId']} + onChangeStorage={(value: StorageData) => { setUploadParams({ ...uploadParams, - sourceStorage: { - location: (value.location) ? value.location : defaultStorageLocation, - cloudStorageId: (value.location) ? value.cloud_storage_id : defaultStorageCloudId, - } as Storage, + sourceStorage: new Storage({ + location: value?.location || defaultStorageLocation, + cloudStorageId: (value.location) ? value.cloudStorageId : defaultStorageCloudId, + }), } as UploadParams); }} + locationValue={selectedSourceStorageLocation} + onChangeLocationValue={(value: StorageLocation) => setSelectedSourceStorageLocation(value)} />} - {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.CLOUD_STORAGE && renderCustomName()} - {!useDefaultSettings && selectedSourceStorage?.location === StorageLocation.LOCAL && uploadLocalFile()} + {!useDefaultSettings && selectedSourceStorageLocation === StorageLocation.CLOUD_STORAGE && renderCustomName()} + {!useDefaultSettings && selectedSourceStorageLocation === StorageLocation.LOCAL && uploadLocalFile()} diff --git a/cvat-ui/src/components/storage/source-storage-field.tsx b/cvat-ui/src/components/storage/source-storage-field.tsx index 2972adef596..05fc7ac5313 100644 --- a/cvat-ui/src/components/storage/source-storage-field.tsx +++ b/cvat-ui/src/components/storage/source-storage-field.tsx @@ -4,16 +4,20 @@ import './styles.scss'; import React from 'react'; -import { Storage } from 'reducers'; import StorageWithSwitchField from './storage-with-switch-field'; +import { StorageData } from 'cvat-core-wrapper'; +import { StorageLocation } from 'reducers'; + export interface Props { projectId: number | null; + locationValue: StorageLocation; switchDescription?: string; switchHelpMessage?: string; storageDescription?: string; useProjectStorage?: boolean | null; - onChangeStorage?: (values: Storage) => void; + onChangeLocationValue?: (value: StorageLocation) => void; + onChangeStorage?: (values: StorageData) => void; onChangeUseProjectStorage?: (value: boolean) => void; } @@ -24,8 +28,10 @@ export default function SourceStorageField(props: Props): JSX.Element { switchHelpMessage, storageDescription, useProjectStorage, + locationValue, onChangeUseProjectStorage, onChangeStorage, + onChangeLocationValue, } = props; @@ -35,12 +41,14 @@ export default function SourceStorageField(props: Props): JSX.Element { storageName='sourceStorage' switchName='useProjectSourceStorage' projectId={projectId} + locationValue={locationValue} useProjectStorage={useProjectStorage} switchDescription={switchDescription} switchHelpMessage={switchHelpMessage} storageDescription={storageDescription} onChangeUseProjectStorage={onChangeUseProjectStorage} onChangeStorage={onChangeStorage} + onChangeLocationValue={onChangeLocationValue} /> ); } diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index ea921ed948e..f783694f8b9 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -6,24 +6,29 @@ import './styles.scss'; import React, { useEffect, useState } from 'react'; import Select from 'antd/lib/select'; import Form from 'antd/lib/form'; -import { CloudStorage, Storage, StorageLocation } from 'reducers'; +import { CloudStorage, StorageLocation } from 'reducers'; import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; +import { StorageData } from 'cvat-core-wrapper'; + const { Option } = Select; export interface Props { locationName: string[]; selectCloudStorageName: string[]; - onChangeStorage?: (value: Storage) => void; + locationValue: StorageLocation; + onChangeLocationValue?: (value: StorageLocation) => void; + onChangeStorage?: (value: StorageData) => void; } export default function StorageField(props: Props): JSX.Element { const { locationName, selectCloudStorageName, - onChangeStorage + locationValue, + onChangeStorage, + onChangeLocationValue, } = props; - const [locationValue, setLocationValue] = useState(StorageLocation.LOCAL); const [cloudStorage, setCloudStorage] = useState(null); const [potentialCloudStorage, setPotentialCloudStorage] = useState(''); @@ -43,7 +48,7 @@ export default function StorageField(props: Props): JSX.Element { useEffect(() => { if (locationValue === StorageLocation.LOCAL) { - setCloudStorage(null); + setPotentialCloudStorage(''); } }, [locationValue]); @@ -51,8 +56,8 @@ export default function StorageField(props: Props): JSX.Element { if (onChangeStorage) { onChangeStorage({ location: locationValue, - cloudStorageId: cloudStorage?.id, - } as Storage); + cloudStorageId: cloudStorage?.id ? parseInt(cloudStorage?.id) : undefined, + }); } }, [cloudStorage, locationValue]); @@ -60,8 +65,12 @@ export default function StorageField(props: Props): JSX.Element { <> { - if (onChangeLocationValue) onChangeLocationValue(location) + if (onChangeLocationValue) onChangeLocationValue(location); }} onClear={() => { - if (onChangeLocationValue) onChangeLocationValue(StorageLocation.LOCAL) + if (onChangeLocationValue) onChangeLocationValue(StorageLocation.LOCAL); }} allowClear > diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index 8fef141cfde..265d78ab8bc 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -8,13 +8,13 @@ import Form from 'antd/lib/form'; import Text from 'antd/lib/typography/Text'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; -import StorageField from './storage-field'; import Tooltip from 'antd/lib/tooltip'; import { QuestionCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; - import { StorageData } from 'cvat-core-wrapper'; import { StorageLocation } from 'reducers'; +import StorageField from './storage-field'; + export interface Props { instanceId: number | null; storageName: string; @@ -30,7 +30,6 @@ export interface Props { onChangeUseDefaultStorage?: (value: boolean) => void; } - export default function StorageWithSwitchField(props: Props): JSX.Element { const { instanceId, @@ -50,7 +49,7 @@ export default function StorageWithSwitchField(props: Props): JSX.Element { return ( <> { - !!instanceId && + !!instanceId && ( {switchDescription} - {(switchHelpMessage) ? - - : null} + { + (switchHelpMessage) ? ( + + + + ) : null + } + ) } { - (!instanceId || !useDefaultStorage) && - - - {storageLabel} - - - - - - )} - > - - + (!instanceId || !useDefaultStorage) && ( + + + {storageLabel} + + + + + + )} + > + + + ) } ); diff --git a/cvat-ui/src/components/storage/target-storage-field.tsx b/cvat-ui/src/components/storage/target-storage-field.tsx index eecb4693a16..b403cae4518 100644 --- a/cvat-ui/src/components/storage/target-storage-field.tsx +++ b/cvat-ui/src/components/storage/target-storage-field.tsx @@ -5,8 +5,9 @@ import './styles.scss'; import React from 'react'; import { StorageLocation } from 'reducers'; -import StorageWithSwitchField from './storage-with-switch-field'; import { StorageData } from 'cvat-core-wrapper'; +import StorageWithSwitchField from './storage-with-switch-field'; + export interface Props { instanceId: number | null; locationValue: StorageLocation; @@ -32,7 +33,6 @@ export default function TargetStorageField(props: Props): JSX.Element { onChangeStorage, } = props; - return ( Date: Thu, 1 Sep 2022 12:59:21 +0200 Subject: [PATCH 31/60] Fix eslint --- .../export-dataset/export-dataset-modal.tsx | 47 +++++++++---------- .../file-manager/cloud-storages-tab.tsx | 3 +- .../import-backup/import-backup-modal.tsx | 11 ++--- .../import-dataset/import-dataset-modal.tsx | 13 ++--- .../import-dataset-status-modal.tsx | 8 ++-- .../components/projects-page/actions-menu.tsx | 4 +- .../src/components/projects-page/top-bar.tsx | 5 +- .../storage/storage-with-switch-field.tsx | 5 +- cvat-ui/src/components/tasks-page/top-bar.tsx | 4 +- cvat-ui/src/reducers/export-reducer.ts | 19 ++++---- cvat-ui/src/reducers/import-reducer.ts | 26 +++++----- cvat-ui/src/reducers/notifications-reducer.ts | 19 ++++---- 12 files changed, 79 insertions(+), 85 deletions(-) diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 3b16f9f3055..8e2af1991a1 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -39,7 +39,7 @@ const initialValues: FormValues = { cloudStorageId: undefined, }, useProjectTargetStorage: true, -} +}; function ExportDatasetModal(props: StateToProps): JSX.Element { const { @@ -77,36 +77,36 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { } }, [instance?.id, instance instanceof core.classes.Project]); - useEffect(() => { if (instance) { if (instance instanceof core.classes.Project || instance instanceof core.classes.Task) { setDefaultStorageLocation(instance.targetStorage?.location || StorageLocation.LOCAL); setDefaultStorageCloudId(instance.targetStorage?.cloudStorageId || null); } else { - core.tasks.get({ id: instance.taskId }).then((response: any) => { - if (response.length) { - const [taskInstance] = response; - setDefaultStorageLocation(taskInstance.targetStorage?.location || StorageLocation.LOCAL); - setDefaultStorageCloudId(taskInstance.targetStorage?.cloudStorageId || null); - } - }) - .catch((error: Error) => { - if ((error as any).code !== 403) { - Notification.error({ - message: `Could not fetch the task ${instance.taskId}`, - description: error.toString(), - }); - } - }); + core.tasks.get({ id: instance.taskId }) + .then((response: any) => { + if (response.length) { + const [taskInstance] = response; + setDefaultStorageLocation(taskInstance.targetStorage?.location || StorageLocation.LOCAL); + setDefaultStorageCloudId(taskInstance.targetStorage?.cloudStorageId || null); + } + }) + .catch((error: Error) => { + if ((error as any).code !== 403) { + Notification.error({ + message: `Could not fetch the task ${instance.taskId}`, + description: error.toString(), + }); + } + }); } } }, [instance?.id, instance?.targetStorage]); useEffect(() => { - setHelpMessage( - `Export to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + - `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`); + // eslint-disable-next-line prefer-template + setHelpMessage(`Export to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + + `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`); }, [defaultStorageLocation, defaultStorageCloudId]); const closeModal = (): void => { @@ -128,7 +128,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { useDefaultTargetStorage ? new Storage({ location: defaultStorageLocation, cloudStorageId: defaultStorageCloudId, - }): new Storage(targetStorage), + }) : new Storage(targetStorage), values.customName ? `${values.customName}.zip` : null, ), ); @@ -193,7 +193,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { - + Save images @@ -223,7 +223,6 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { ); } - interface StateToProps { dumpers: any; instance: any; @@ -245,4 +244,4 @@ function mapStateToProps(state: CombinedState): StateToProps { }; } -export default connect(mapStateToProps)(ExportDatasetModal); \ No newline at end of file +export default connect(mapStateToProps)(ExportDatasetModal); diff --git a/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx b/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx index dabb1d4619b..d78c439942b 100644 --- a/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx +++ b/cvat-ui/src/components/file-manager/cloud-storages-tab.tsx @@ -6,11 +6,10 @@ import './styles.scss'; import React, { useEffect, useState } from 'react'; import Form from 'antd/lib/form'; - import Select from 'antd/lib/select'; import { CloudStorage } from 'reducers'; -import CloudStorageFiles from './cloud-storages-files'; import SelectCloudStorage from 'components/select-cloud-storage/select-cloud-storage'; +import CloudStorageFiles from './cloud-storages-files'; interface Props { formRef: any; diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index d88f3b7aa8a..82f9c4e5ea8 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -28,8 +28,8 @@ const initialValues: FormValues = { sourceStorage: { location: StorageLocation.LOCAL, cloudStorageId: undefined, - } -} + }, +}; function ImportBackupModal(): JSX.Element { const [form] = Form.useForm(); @@ -80,7 +80,7 @@ function ImportBackupModal(): JSX.Element { } return Promise.resolve(); - } + }; const renderCustomName = (): JSX.Element => { return ( @@ -95,7 +95,7 @@ function ImportBackupModal(): JSX.Element { />
    ); - } + }; const closeModal = useCallback((): void => { setSelectedSourceStorage({ @@ -123,14 +123,13 @@ function ImportBackupModal(): JSX.Element { Notification.info({ message: `The ${instanceType} creating from the backup has been started`, - className: `cvat-notification-notice-import-backup-start`, + className: 'cvat-notification-notice-import-backup-start', }); closeModal(); }, [instanceType, file], ); - return ( <> { @@ -159,8 +158,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { !selectedLoader.format.toLowerCase().split(', ').includes(_file.name.split('.')[_file.name.split('.').length - 1])) { message.error( `For ${selectedLoader.name} format only files with ` + - `${selectedLoader.format.toLowerCase()} extension can be used` - ); + `${selectedLoader.format.toLowerCase()} extension can be used`); } else { setFile(_file); setUploadParams({ @@ -194,8 +192,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { if (!allowedExtensions.includes(extension)) { return Promise.reject(new Error( `For ${selectedLoader.name} format only files with ` + - `${selectedLoader.format.toLowerCase()} extension can be used` - )); + `${selectedLoader.format.toLowerCase()} extension can be used`)); } } if (isDataset()) { @@ -247,7 +244,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, uploadParams.useDefaultSettings, uploadParams.sourceStorage, - uploadParams.file || (uploadParams.fileName as string)) + uploadParams.file || uploadParams.fileName as string) ); const resToPrint = uploadParams.resource.charAt(0).toUpperCase() + uploadParams.resource.slice(1); Notification.info({ @@ -299,7 +296,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { title={( <> - Import {resource} to {instanceType} + {`Import ${resource} to ${instanceType}`} { instance instanceof core.classes.Project && ( diff --git a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx index 5e76e7ddd78..593b532e030 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-status-modal.tsx @@ -18,23 +18,23 @@ function ImportDatasetStatusModal(): JSX.Element { useEffect(() => { const [id] = Object.keys(current); - setImportingId(parseInt(id)); + setImportingId(parseInt(id, 10)); }, [current]); const importing = useSelector((state: CombinedState) => { - if (!importingId){ + if (!importingId) { return false; } return !!state.import.projects.dataset.current[importingId]; }); const progress = useSelector((state: CombinedState) => { - if (!importingId){ + if (!importingId) { return 0; } return state.import.projects.dataset.current[importingId]?.progress; }); const status = useSelector((state: CombinedState) => { - if (!importingId){ + if (!importingId) { return ''; } return state.import.projects.dataset.current[importingId]?.status; diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 33d28f5d328..9e369d6a12b 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -21,7 +21,9 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { const { projectInstance } = props; const dispatch = useDispatch(); - const exportBackupIsActive = useSelector((state: CombinedState) => state.export.projects.backup.current[projectInstance.id]); + const exportBackupIsActive = useSelector((state: CombinedState) => { + return state.export.projects.backup.current[projectInstance.id]; + }); const onDeleteProject = useCallback((): void => { Modal.confirm({ diff --git a/cvat-ui/src/components/projects-page/top-bar.tsx b/cvat-ui/src/components/projects-page/top-bar.tsx index c32c6fef411..fc765c1894a 100644 --- a/cvat-ui/src/components/projects-page/top-bar.tsx +++ b/cvat-ui/src/components/projects-page/top-bar.tsx @@ -5,11 +5,13 @@ import React, { useState, useEffect } from 'react'; import { useHistory } from 'react-router'; +import { useDispatch } from 'react-redux'; import { Row, Col } from 'antd/lib/grid'; import Button from 'antd/lib/button'; import Dropdown from 'antd/lib/dropdown'; import Input from 'antd/lib/input'; import { PlusOutlined, UploadOutlined, LoadingOutlined } from '@ant-design/icons'; +import { importActions } from 'actions/import-actions'; import { usePrevious } from 'utils/hooks'; import { ProjectsQuery } from 'reducers'; import { SortingComponent, ResourceFilterHOC, defaultVisibility } from 'components/resource-sorting-filtering'; @@ -18,9 +20,6 @@ import { localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, config, } from './projects-filter-configuration'; -import { importActions } from 'actions/import-actions'; -import { useDispatch } from 'react-redux'; - const FilteringComponent = ResourceFilterHOC( config, localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, ); diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index 265d78ab8bc..f6d1d73182c 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -65,10 +65,9 @@ export default function StorageWithSwitchField(props: Props): JSX.Element { /> {switchDescription} - { - (switchHelpMessage) ? ( + {(switchHelpMessage) ? ( - + ) : null } diff --git a/cvat-ui/src/components/tasks-page/top-bar.tsx b/cvat-ui/src/components/tasks-page/top-bar.tsx index 7b2fddc4982..213a29ef96d 100644 --- a/cvat-ui/src/components/tasks-page/top-bar.tsx +++ b/cvat-ui/src/components/tasks-page/top-bar.tsx @@ -6,18 +6,20 @@ import React, { useState, useEffect } from 'react'; import { useDispatch } from 'react-redux'; import { useHistory } from 'react-router'; + import { Row, Col } from 'antd/lib/grid'; import Dropdown from 'antd/lib/dropdown'; import { PlusOutlined, UploadOutlined, LoadingOutlined } from '@ant-design/icons'; import Button from 'antd/lib/button'; import Input from 'antd/lib/input'; +import { importActions } from 'actions/import-actions'; import { SortingComponent, ResourceFilterHOC, defaultVisibility } from 'components/resource-sorting-filtering'; import { TasksQuery } from 'reducers'; import { usePrevious } from 'utils/hooks'; import { localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, config, } from './tasks-filter-configuration'; -import { importActions } from 'actions/import-actions'; + const FilteringComponent = ResourceFilterHOC( config, localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, ); diff --git a/cvat-ui/src/reducers/export-reducer.ts b/cvat-ui/src/reducers/export-reducer.ts index 813a8608717..bd944e4e2fa 100644 --- a/cvat-ui/src/reducers/export-reducer.ts +++ b/cvat-ui/src/reducers/export-reducer.ts @@ -19,7 +19,7 @@ const defaultState: ExportState = { backup: { modalInstance: null, current: {}, - } + }, }, tasks: { dataset: { @@ -29,7 +29,7 @@ const defaultState: ExportState = { backup: { modalInstance: null, current: {}, - } + }, }, jobs: { dataset: { @@ -70,7 +70,7 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor dataset: { ...state[activitiesField].dataset, modalInstance: null, - } + }, }, instanceType: null, }; @@ -87,13 +87,12 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor ...state[field].dataset, current: { ...state[field].dataset.current, - [instance.id]: !state[field].dataset.current[instance.id] ? [format] - : [...state[field].dataset.current[instance.id], format], - } - } - } + [instance.id]: !state[field].dataset.current[instance.id] ? [format] : + [...state[field].dataset.current[instance.id], format], + }, + }, + }, }; - } case ExportActionTypes.EXPORT_DATASET_FAILED: case ExportActionTypes.EXPORT_DATASET_SUCCESS: { @@ -174,7 +173,7 @@ export default (state: ExportState = defaultState, action: ExportActions): Expor backup: { ...state[field].backup, current: omit(state[field].backup, instance.id), - } + }, }, }; } diff --git a/cvat-ui/src/reducers/import-reducer.ts b/cvat-ui/src/reducers/import-reducer.ts index f23fd07c551..6c2eec49c90 100644 --- a/cvat-ui/src/reducers/import-reducer.ts +++ b/cvat-ui/src/reducers/import-reducer.ts @@ -3,24 +3,22 @@ // // SPDX-License-Identifier: MIT +import { omit } from 'lodash'; import { ImportActions, ImportActionTypes } from 'actions/import-actions'; import { ImportState } from '.'; import { getCore } from 'cvat-core-wrapper'; -import { omit } from 'lodash'; - const core = getCore(); const defaultProgress = 0.0; export function defineActititiesField(instance: any): 'projects' | 'tasks' | 'jobs' { - if (instance instanceof core.classes.Project) { + if (instance instanceof core.classes.Project) { return 'projects'; } else if (instance instanceof core.classes.Task) { return 'tasks'; - } else { // job - return 'jobs'; } + return 'jobs'; } const defaultState: ImportState = { @@ -66,7 +64,7 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor dataset: { ...state[activitiesField].dataset, modalInstance: instance, - } + }, }, instanceType: activitiesField .slice(0, activitiesField.length - 1) as 'project' | 'task' | 'job', @@ -103,7 +101,7 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor ...updatedActivity, status: 'The file is being uploaded to the server', progress: defaultProgress, - } + }; } return { ...state, @@ -169,7 +167,7 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor backup: { modalVisible: true, importing: false, - } + }, }, instanceType, }; @@ -185,7 +183,7 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor backup: { ...state[field].backup, modalVisible: false, - } + }, }, instanceType: null, }; @@ -201,9 +199,9 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor backup: { ...state[field].backup, importing: true, - } - } - } + }, + }, + }; } case ImportActionTypes.IMPORT_BACKUP_FAILED: case ImportActionTypes.IMPORT_BACKUP_SUCCESS: { @@ -217,8 +215,8 @@ export default (state: ImportState = defaultState, action: ImportActions): Impor backup: { ...state[field].backup, importing: false, - } - } + }, + }, }; } default: diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 0b2fa88306b..821dcb4a494 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -393,14 +393,14 @@ export default function (state = defaultState, action: AnyAction): Notifications ...state.messages.exporting, dataset: `${resource} for ${instanceType} ${instance.id} ` + - `${auxiliaryVerb} been ${(isLocal) ? "downloaded" : "uploaded"} ` + - `${(isLocal) ? "locally" : "to cloud storage"}`, + `${auxiliaryVerb} been ${(isLocal) ? 'downloaded' : 'uploaded'} ` + + `${(isLocal) ? 'locally' : 'to cloud storage'}`, }, }, }; } case ExportActionTypes.EXPORT_BACKUP_FAILED: { - const { instanceId, instanceType} = action.payload; + const { instanceId, instanceType } = action.payload; return { ...state, errors: { @@ -426,8 +426,8 @@ export default function (state = defaultState, action: AnyAction): Notifications ...state.messages.exporting, backup: `Backup for the ${instanceType} №${instance.id} ` + - `has been ${(isLocal) ? "downloaded" : "uploaded"} ` + - `${(isLocal) ? "locally" : "to cloud storage"}`, + `has been ${(isLocal) ? 'downloaded' : 'uploaded'} ` + + `${(isLocal) ? 'locally' : 'to cloud storage'}`, }, }, }; @@ -436,7 +436,8 @@ export default function (state = defaultState, action: AnyAction): Notifications const { instance, resource } = action.payload; const message = resource === 'annotation' ? 'Annotations have been loaded to the ' + - `task ${instance.taskId || instance.id}` : + `` + + `task ${instance.taskId || instance.id}` : 'Dataset has been imported to the ' + `project ${instance.id}`; return { @@ -456,7 +457,7 @@ export default function (state = defaultState, action: AnyAction): Notifications `` : 'Could not import dataset to the ' + `` + - `project ${instance.id}` + `project ${instance.id}`; return { ...state, errors: { @@ -464,10 +465,10 @@ export default function (state = defaultState, action: AnyAction): Notifications importing: { ...state.errors.importing, dataset: { - message: message, + message, reason: action.payload.error.toString(), className: 'cvat-notification-notice-' + - `${resource === 'annotation' ? "load-annotation" : "import-dataset"}-failed` + `${resource === 'annotation' ? 'load-annotation' : 'import-dataset'}-failed`, }, }, }, From d3a3ed98dcbbae001dc0582d42bf27358e53fb08 Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 1 Sep 2022 16:15:07 +0200 Subject: [PATCH 32/60] eslint --- cvat-core/src/annotations.ts | 2 +- cvat-core/src/project-implementation.ts | 6 ++-- cvat-core/src/project.ts | 12 ++++---- cvat-core/src/server-proxy.ts | 37 ++++++++++++------------- cvat-core/src/session.ts | 32 ++++++++++----------- cvat-core/src/storage.ts | 9 +++--- cvat-ui/src/actions/export-actions.ts | 31 ++++++++++++++++----- cvat-ui/src/actions/import-actions.ts | 28 +++++++++++-------- cvat-ui/src/reducers/import-reducer.ts | 5 ++-- 9 files changed, 91 insertions(+), 71 deletions(-) diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index bcfa1571cff..a5917ce471f 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -3,6 +3,7 @@ // // SPDX-License-Identifier: MIT +import { Storage } from './storage'; const serverProxy = require('./server-proxy').default; const Collection = require('./annotations-collection'); const AnnotationsSaver = require('./annotations-saver'); @@ -12,7 +13,6 @@ const Project = require('./project').default; const { Task, Job } = require('./session'); const { ScriptingError, DataError, ArgumentError } = require('./exceptions'); const { getDeletedFrames } = require('./frames'); -import { Storage } from './storage'; const jobCache = new WeakMap(); const taskCache = new WeakMap(); diff --git a/cvat-core/src/project-implementation.ts b/cvat-core/src/project-implementation.ts index d93bfaae877..efef65a74f3 100644 --- a/cvat-core/src/project-implementation.ts +++ b/cvat-core/src/project-implementation.ts @@ -75,7 +75,7 @@ export default function implementProject(projectClass) { saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - customName?: string + customName?: string, ) { const result = exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; @@ -85,7 +85,7 @@ export default function implementProject(projectClass) { useDefaultSettings: boolean, sourceStorage: Storage, file: File | string, - updateStatusCallback + updateStatusCallback, ) { return importDataset(this, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); }; @@ -93,7 +93,7 @@ export default function implementProject(projectClass) { projectClass.prototype.backup.implementation = async function ( targetStorage: Storage, useDefaultSettings: boolean, - fileName?: string + fileName?: string, ) { const result = await serverProxy.projects.backup(this.id, targetStorage, useDefaultSettings, fileName); return result; diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index e21bb1cae33..cf08a553028 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -275,7 +275,7 @@ export default class Project { location: data.target_storage?.location || StorageLocation.LOCAL, cloudStorageId: data.target_storage?.cloud_storage_id, }); - } + }, }, _internalData: { get: () => data, @@ -359,7 +359,7 @@ export default class Project { Project.prototype.backup, targetStorage, useDefaultSettings, - fileName + fileName, ); return result; } @@ -391,7 +391,7 @@ Object.defineProperties( saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - customName?: string + customName?: string, ) { const result = await PluginRegistry.apiWrapper.call( this, @@ -400,7 +400,7 @@ Object.defineProperties( saveImages, useDefaultSettings, targetStorage, - customName + customName, ); return result; }, @@ -409,7 +409,7 @@ Object.defineProperties( useDefaultSettings: boolean, sourceStorage: Storage, file: File | string, - updateStatusCallback = null + updateStatusCallback = null, ) { const result = await PluginRegistry.apiWrapper.call( this, @@ -418,7 +418,7 @@ Object.defineProperties( useDefaultSettings, sourceStorage, file, - updateStatusCallback + updateStatusCallback, ); return result; }, diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index 07c5441a018..b32a0f1571e 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -14,29 +14,29 @@ type Params = { format?: string, filename?: string, action?: string, -} +}; const FormData = require('form-data'); -const { ServerError } = require('./exceptions'); const store = require('store'); const config = require('./config'); const DownloadWorker = require('./download.worker'); const Axios = require('axios'); const tus = require('tus-js-client'); +const { ServerError } = require('./exceptions'); function enableOrganization() { return { org: config.organizationID || '' }; } -function configureStorage(storage: Storage, useDefaultLocation: boolean = false) { +function configureStorage(storage: Storage, useDefaultLocation = false): Partial { return { use_default_location: useDefaultLocation, ...(!useDefaultLocation ? { location: storage.location, ...(storage.cloudStorageId ? { cloud_storage_id: storage.cloudStorageId, - } : {}) - } : {}) + } : {}), + } : {}), }; } @@ -612,7 +612,7 @@ class ServerProxy { saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - name?: string + name?: string, ) { const { backendAPI } = config; const baseURL = `${backendAPI}/${instanceType}/${id}/${saveImages ? 'dataset' : 'annotations'}`; @@ -657,7 +657,7 @@ class ServerProxy { useDefaultLocation: boolean, sourceStorage: Storage, file: File | string, - onUpdate + onUpdate, ) { const { backendAPI, origin } = config; const params: Params = { @@ -747,7 +747,7 @@ class ServerProxy { const params: Params = { ...enableOrganization(), ...configureStorage(targetStorage, useDefaultSettings), - ...(fileName ? { filename: fileName } : {}) + ...(fileName ? { filename: fileName } : {}), }; const url = `${backendAPI}/tasks/${id}/backup`; @@ -789,7 +789,7 @@ class ServerProxy { const taskData = new FormData(); let response; - async function wait(taskData, response) { + async function wait() { return new Promise((resolve, reject) => { async function checkStatus() { try { @@ -842,21 +842,21 @@ class ServerProxy { headers: { 'Upload-Finish': true }, }); } - return wait(taskData, response); + return wait(); } async function backupProject( id: number, targetStorage: Storage, useDefaultSettings: boolean, - fileName?: string + fileName?: string, ) { const { backendAPI } = config; // keep current default params to 'freeze" them during this request const params: Params = { ...enableOrganization(), ...configureStorage(targetStorage, useDefaultSettings), - ...(fileName ? { filename: fileName } : {}) + ...(fileName ? { filename: fileName } : {}), }; const url = `${backendAPI}/projects/${id}/backup`; @@ -893,13 +893,13 @@ class ServerProxy { const params: Params = { ...enableOrganization(), ...configureStorage(storage), - } + }; const url = `${backendAPI}/projects/backup`; const projectData = new FormData(); let response; - async function wait(projectData, response) { + async function wait() { return new Promise((resolve, reject) => { async function request() { try { @@ -923,6 +923,7 @@ class ServerProxy { setTimeout(request); }); }; + const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; if (isCloudStorage) { @@ -951,10 +952,9 @@ class ServerProxy { params: { ...params, filename }, proxy: config.proxy, headers: { 'Upload-Finish': true }, - } - ); + }); } - return wait(projectData, response); + return wait(); } async function createTask(taskSpec, taskDataSpec, onUpdate) { @@ -1436,7 +1436,7 @@ class ServerProxy { format: string, useDefaultLocation: boolean, sourceStorage: Storage, - file: File | string + file: File | string, ) { const { backendAPI, origin } = config; const params: Params = { @@ -1505,7 +1505,6 @@ class ServerProxy { proxy: config.proxy, headers: { 'Upload-Finish': true }, }); - } catch (errorData) { throw generateError(errorData); } diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 56d7ec767ba..3fdd79d5bfe 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -161,7 +161,7 @@ function buildDuplicatedAPI(prototype) { saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - customName?: string + customName?: string, ) { const result = await PluginRegistry.apiWrapper.call( this, @@ -170,7 +170,7 @@ function buildDuplicatedAPI(prototype) { saveImages, useDefaultSettings, targetStorage, - customName + customName, ); return result; }, @@ -1770,12 +1770,12 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ArgumentError} */ sourceStorage: { - get: () => { - return new Storage({ + get: () => ( + new Storage({ location: data.source_storage?.location || StorageLocation.LOCAL, cloudStorageId: data.source_storage?.cloud_storage_id, - }); - }, + }) + ), }, /** * Target storage for export resources. @@ -1786,12 +1786,12 @@ export class Task extends Session { * @throws {module:API.cvat.exceptions.ArgumentError} */ targetStorage: { - get: () => { - return new Storage({ + get: () => ( + new Storage({ location: data.target_storage?.location || StorageLocation.LOCAL, cloudStorageId: data.target_storage?.cloud_storage_id, - }); - }, + }) + ), }, _internalData: { get: () => data, @@ -1918,7 +1918,7 @@ export class Task extends Session { Task.prototype.backup, targetStorage, useDefaultSettings, - fileName + fileName, ); return result; } @@ -2229,7 +2229,7 @@ Job.prototype.annotations.upload.implementation = async function ( format: string, useDefaultLocation: boolean, sourceStorage: Storage, - file: File | string + file: File | string, ) { const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); return result; @@ -2250,7 +2250,7 @@ Job.prototype.annotations.exportDataset.implementation = async function ( saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - customName?: string + customName?: string, ) { const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; @@ -2427,7 +2427,7 @@ Task.prototype.delete.implementation = async function () { Task.prototype.backup.implementation = async function ( targetStorage: Storage, useDefaultSettings: boolean, - fileName?: string + fileName?: string, ) { const result = await serverProxy.tasks.backup(this.id, targetStorage, useDefaultSettings, fileName); return result; @@ -2666,7 +2666,7 @@ Task.prototype.annotations.upload.implementation = async function ( format: string, useDefaultLocation: boolean, sourceStorage: Storage, - file: File | string + file: File | string, ) { const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); return result; @@ -2687,7 +2687,7 @@ Task.prototype.annotations.exportDataset.implementation = async function ( saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - customName?: string + customName?: string, ) { const result = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName); return result; diff --git a/cvat-core/src/storage.ts b/cvat-core/src/storage.ts index f5b5c5ca8e3..9c0e8d3284d 100644 --- a/cvat-core/src/storage.ts +++ b/cvat-core/src/storage.ts @@ -29,7 +29,6 @@ export class Storage { cloudStorageId: initialData?.cloudStorageId, }; - Object.defineProperties( this, Object.freeze({ @@ -41,7 +40,7 @@ export class Storage { * @readonly */ location: { - get: () => data.location + get: () => data.location, }, /** * @name cloudStorageId @@ -51,7 +50,7 @@ export class Storage { * @readonly */ cloudStorageId: { - get: () => data.cloudStorageId + get: () => data.cloudStorageId, }, }), ); @@ -61,7 +60,7 @@ export class Storage { location: this.location, ...(this.cloudStorageId ? { cloud_storage_id: this.cloudStorageId, - } : {}) + } : {}), }; } -} \ No newline at end of file +} diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 9d0d1a604dc..5f73518d2f8 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -38,7 +38,12 @@ export const exportActions = { format: string, isLocal: boolean, ) => ( - createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, { instance, instanceType, format, isLocal }) + createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, { + instance, + instanceType, + format, + isLocal + }) ), exportDatasetFailed: (instance: any, instanceType: 'project' | 'task' | 'job', format: string, error: any) => ( createAction(ExportActionTypes.EXPORT_DATASET_FAILED, { @@ -71,15 +76,22 @@ export const exportDatasetAsync = ( saveImages: boolean, useDefaultSettings: boolean, targetStorage: Storage, - name?: string + name?: string, ): ThunkAction => async (dispatch) => { dispatch(exportActions.exportDataset(instance, format)); - const instanceType = instance instanceof core.classes.Project ? 'project' : - instance instanceof core.classes.Task ? 'task' : 'job'; + let instanceType; + if (instance instanceof core.classes.Project) { + instanceType = 'project'; + } else if (instance instanceof core.classes.Task) { + instanceType = 'task'; + } else { + instanceType = 'job'; + } try { - const result = await instance.annotations.exportDataset(format, saveImages, useDefaultSettings, targetStorage, name); + const result = await instance.annotations + .exportDataset(format, saveImages, useDefaultSettings, targetStorage, name); if (result) { const downloadAnchor = window.document.getElementById('downloadAnchor') as HTMLAnchorElement; downloadAnchor.href = result; @@ -91,7 +103,12 @@ export const exportDatasetAsync = ( } }; -export const exportBackupAsync = (instance: any, targetStorage: Storage, useDefaultSetting: boolean, fileName?: string): ThunkAction => async (dispatch) => { +export const exportBackupAsync = ( + instance: any, + targetStorage: Storage, + useDefaultSetting: boolean, + fileName?: string +): ThunkAction => async (dispatch) => { dispatch(exportActions.exportBackup(instance)); const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; @@ -104,7 +121,7 @@ export const exportBackupAsync = (instance: any, targetStorage: Storage, useDefa } dispatch(exportActions.exportBackupSuccess(instance, instanceType, !!result)); } catch (error) { - dispatch(exportActions.exportBackupFailed(instance, instanceType, error as Error)); + dispatch(exportActions.exportBackupFailed(instance, instanceType, error as Error)); } }; diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index cebe206736d..4f9ffc399e6 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -5,11 +5,10 @@ import { createAction, ActionUnion, ThunkAction } from 'utils/redux'; import { CombinedState } from 'reducers'; -import { getProjectsAsync } from './projects-actions'; import { getCore, Storage } from 'cvat-core-wrapper'; import { LogType } from 'cvat-logger'; - -import { jobInfoGenerator, receiveAnnotationsParameters, AnnotationActionTypes } from 'actions/annotation-actions'; +import { getProjectsAsync } from './projects-actions'; +import { jobInfoGenerator, receiveAnnotationsParameters, AnnotationActionTypes } from './annotation-actions'; const core = getCore(); @@ -28,10 +27,12 @@ export enum ImportActionTypes { } export const importActions = { - openImportDatasetModal: (instance: any) => - createAction(ImportActionTypes.OPEN_IMPORT_DATASET_MODAL, { instance }), - closeImportDatasetModal: (instance: any) => - createAction(ImportActionTypes.CLOSE_IMPORT_DATASET_MODAL, { instance }), + openImportDatasetModal: (instance: any) => ( + createAction(ImportActionTypes.OPEN_IMPORT_DATASET_MODAL, { instance }) + ), + closeImportDatasetModal: (instance: any) => ( + createAction(ImportActionTypes.CLOSE_IMPORT_DATASET_MODAL, { instance }) + ), importDataset: (instance: any, format: string) => ( createAction(ImportActionTypes.IMPORT_DATASET, { instance, format }) ), @@ -68,7 +69,7 @@ export const importDatasetAsync = ( format: string, useDefaultSettings: boolean, sourceStorage: Storage, - file: File | string + file: File | string, ): ThunkAction => ( async (dispatch, getState) => { const resource = instance instanceof core.classes.Project ? 'dataset' : 'annotation'; @@ -81,9 +82,11 @@ export const importDatasetAsync = ( throw Error('Only one importing of annotation/dataset allowed at the same time'); } dispatch(importActions.importDataset(instance, format)); - await instance.annotations.importDataset(format, useDefaultSettings, sourceStorage, file, (message: string, progress: number) => ( - dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) - )); + await instance.annotations + .importDataset(format, useDefaultSettings, sourceStorage, file, + (message: string, progress: number) => ( + dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) + )); } else if (instance instanceof core.classes.Task) { if (state.import.tasks.dataset.current?.[instance.id]) { throw Error('Only one importing of annotation/dataset allowed at the same time'); @@ -157,6 +160,7 @@ export const importBackupAsync = (instanceType: 'project' | 'task', storage: Sto } catch (error) { dispatch(importActions.importBackupFailed(instanceType, error)); } -}); + } +); export type ImportActions = ActionUnion; diff --git a/cvat-ui/src/reducers/import-reducer.ts b/cvat-ui/src/reducers/import-reducer.ts index 6c2eec49c90..e91ad0cb64c 100644 --- a/cvat-ui/src/reducers/import-reducer.ts +++ b/cvat-ui/src/reducers/import-reducer.ts @@ -5,8 +5,8 @@ import { omit } from 'lodash'; import { ImportActions, ImportActionTypes } from 'actions/import-actions'; -import { ImportState } from '.'; import { getCore } from 'cvat-core-wrapper'; +import { ImportState } from '.'; const core = getCore(); @@ -15,7 +15,8 @@ const defaultProgress = 0.0; export function defineActititiesField(instance: any): 'projects' | 'tasks' | 'jobs' { if (instance instanceof core.classes.Project) { return 'projects'; - } else if (instance instanceof core.classes.Task) { + } + if (instance instanceof core.classes.Task) { return 'tasks'; } return 'jobs'; From a869e511f267ad2edd771b34cac273fcfeaa7037 Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 1 Sep 2022 17:11:13 +0200 Subject: [PATCH 33/60] Fix some eslint issues --- cvat-core/src/project.ts | 16 ++--- cvat-core/src/server-proxy.ts | 9 +-- cvat-ui/src/actions/export-actions.ts | 2 +- cvat-ui/src/actions/tasks-actions.ts | 4 +- .../create-project-content.tsx | 14 ++--- .../advanced-configuration-form.tsx | 63 ++++++++++--------- .../create-task-page/create-task-content.tsx | 61 ++++++++++-------- .../export-backup/export-backup-modal.tsx | 9 ++- .../components/projects-page/actions-menu.tsx | 6 +- .../case_52_dump_upload_annotation.js | 2 +- ..._import_annotations_frames_dots_in_name.js | 7 +-- ...mp_upload_annotation_point_cloud_format.js | 4 +- ...pload_annotation_velodyne_points_format.js | 4 +- tests/cypress/support/commands.js | 4 +- 14 files changed, 109 insertions(+), 96 deletions(-) diff --git a/cvat-core/src/project.ts b/cvat-core/src/project.ts index cf08a553028..4e4cede062b 100644 --- a/cvat-core/src/project.ts +++ b/cvat-core/src/project.ts @@ -254,12 +254,12 @@ export default class Project { * @instance */ sourceStorage: { - get: () => { - return new Storage({ + get: () => ( + new Storage({ location: data.source_storage?.location || StorageLocation.LOCAL, cloudStorageId: data.source_storage?.cloud_storage_id, - }); - }, + }) + ), }, /** * Target storage for export resources. @@ -270,12 +270,12 @@ export default class Project { * @instance */ targetStorage: { - get: () => { - return new Storage({ + get: () => ( + new Storage({ location: data.target_storage?.location || StorageLocation.LOCAL, cloudStorageId: data.target_storage?.cloud_storage_id, - }); - }, + }) + ), }, _internalData: { get: () => data, diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index b32a0f1571e..d4441c63a16 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -8,7 +8,7 @@ import { Storage } from './storage'; type Params = { org: number | string, - use_default_location: boolean, + use_default_location?: boolean, location?: StorageLocation, cloud_storage_id?: number, format?: string, @@ -20,9 +20,10 @@ const FormData = require('form-data'); const store = require('store'); const config = require('./config'); const DownloadWorker = require('./download.worker'); +const { ServerError } = require('./exceptions'); const Axios = require('axios'); const tus = require('tus-js-client'); -const { ServerError } = require('./exceptions'); + function enableOrganization() { return { org: config.organizationID || '' }; @@ -46,7 +47,7 @@ function removeToken() { } function waitFor(frequencyHz, predicate) { - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { if (typeof predicate !== 'function') { reject(new Error(`Predicate must be a function, got ${typeof predicate}`)); } @@ -921,7 +922,7 @@ class ServerProxy { } setTimeout(request); - }); + }) }; const isCloudStorage = storage.location === StorageLocation.CLOUD_STORAGE; diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 5f73518d2f8..2015b34d983 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -80,7 +80,7 @@ export const exportDatasetAsync = ( ): ThunkAction => async (dispatch) => { dispatch(exportActions.exportDataset(instance, format)); - let instanceType; + let instanceType: 'project' | 'task' | 'job'; if (instance instanceof core.classes.Project) { instanceType = 'project'; } else if (instance instanceof core.classes.Task) { diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index 689e6d4f998..b11bd471dfe 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -5,7 +5,9 @@ import { AnyAction, Dispatch, ActionCreator } from 'redux'; import { ThunkAction } from 'redux-thunk'; -import { TasksQuery, CombinedState, Indexable, StorageLocation } from 'reducers'; +import { + TasksQuery,CombinedState, Indexable, StorageLocation +} from 'reducers'; import { getCore, Storage } from 'cvat-core-wrapper'; import { getInferenceStatusAsync } from './models-actions'; diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index 0c8459a5335..0572fe8a42c 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -17,16 +17,14 @@ import Collapse from 'antd/lib/collapse'; import Button from 'antd/lib/button'; import Input from 'antd/lib/input'; import notification from 'antd/lib/notification'; - +import { StorageLocation } from 'reducers'; +import { createProjectAsync } from 'actions/projects-actions'; +import { Storage, StorageData } from 'cvat-core-wrapper'; import patterns from 'utils/validation-patterns'; import LabelsEditor from 'components/labels-editor/labels-editor'; -import { createProjectAsync } from 'actions/projects-actions'; -import CreateProjectContext from './create-project.context'; -import { StorageLocation } from 'reducers'; import SourceStorageField from 'components/storage/source-storage-field'; import TargetStorageField from 'components/storage/target-storage-field'; - -import { Storage, StorageData } from 'cvat-core-wrapper'; +import CreateProjectContext from './create-project.context'; const { Option } = Select; @@ -221,10 +219,10 @@ export default function CreateProjectContent(): JSX.Element { ...advancedValues, name: basicValues.name, source_storage: new Storage( - advancedValues.sourceStorage || { location: StorageLocation.LOCAL } + advancedValues.sourceStorage || { location: StorageLocation.LOCAL, } ).toJSON(), target_storage: new Storage( - advancedValues.targetStorage || { location: StorageLocation.LOCAL } + advancedValues.targetStorage || { location: StorageLocation.LOCAL, } ).toJSON(), }; diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 1b85587173f..cfc2e2afacd 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -74,7 +74,7 @@ const initialValues: AdvancedConfiguration = { targetStorage: { location: StorageLocation.LOCAL, cloudStorageId: undefined, - } + }, }; interface Props { @@ -199,33 +199,32 @@ class AdvancedConfigurationForm extends React.PureComponent { ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), frameFilter, sourceStorage: values.useProjectSourceStorage ? - new Storage(project.sourceStorage || { location: StorageLocation.LOCAL }) - : new Storage(values.sourceStorage), + new Storage(project.sourceStorage || { location: StorageLocation.LOCAL }) : + new Storage(values.sourceStorage), targetStorage: values.useProjectTargetStorage ? - new Storage(project.targetStorage || { location: StorageLocation.LOCAL }) - : new Storage(values.targetStorage), + new Storage(project.targetStorage || { location: StorageLocation.LOCAL }) : + new Storage(values.targetStorage), }); return Promise.resolve(); - }) - } else { - return this.formRef.current.validateFields() - .then( - (values: Store): Promise => { - const frameFilter = values.frameStep ? `step=${values.frameStep}` : undefined; - const entries = Object.entries(values).filter( - (entry: [string, unknown]): boolean => entry[0] !== frameFilter, - ); - - onSubmit({ - ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), - frameFilter, - sourceStorage: new Storage(values.sourceStorage), - targetStorage: new Storage(values.targetStorage), - }); - return Promise.resolve(); - }, - ); + }); } + return this.formRef.current.validateFields() + .then( + (values: Store): Promise => { + const frameFilter = values.frameStep ? `step=${values.frameStep}` : undefined; + const entries = Object.entries(values).filter( + (entry: [string, unknown]): boolean => entry[0] !== frameFilter, + ); + + onSubmit({ + ...((Object.fromEntries(entries) as any) as AdvancedConfiguration), + frameFilter, + sourceStorage: new Storage(values.sourceStorage), + targetStorage: new Storage(values.targetStorage), + }); + return Promise.resolve(); + }, + ); } return Promise.reject(new Error('Form ref is empty')); @@ -265,7 +264,7 @@ class AdvancedConfigurationForm extends React.PureComponent { ]} help='Specify how to sort images. It is not relevant for videos.' > - + Lexicographical @@ -364,7 +363,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use LFS (Large File Support): - + ); @@ -450,7 +449,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use zip/video chunks - + ); @@ -464,7 +463,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use cache - + ); @@ -585,8 +584,12 @@ class AdvancedConfigurationForm extends React.PureComponent { {this.renderBugTracker()}     - {this.renderSourceStorage()} - {this.renderTargetStorage()} + + {this.renderSourceStorage()} + + + {this.renderTargetStorage()} + ); diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index 8ee9afd19a3..36565db1079 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -14,7 +14,8 @@ import notification from 'antd/lib/notification'; import Text from 'antd/lib/typography/Text'; // eslint-disable-next-line import/no-extraneous-dependencies import { ValidateErrorEntity } from 'rc-field-form/lib/interface'; - +import { StorageLocation } from 'reducers'; +import { getCore, Storage } from 'cvat-core-wrapper'; import ConnectedFileManager from 'containers/file-manager/file-manager'; import LabelsEditor from 'components/labels-editor/labels-editor'; import { Files } from 'components/file-manager/file-manager'; @@ -23,10 +24,6 @@ import ProjectSearchField from './project-search-field'; import ProjectSubsetField from './project-subset-field'; import AdvancedConfigurationForm, { AdvancedConfiguration, SortingMethod } from './advanced-configuration-form'; -import { StorageLocation } from 'reducers'; - -import { getCore, Storage } from 'cvat-core-wrapper'; - const core = getCore(); export interface CreateTaskData { @@ -182,7 +179,7 @@ class CreateTaskContent extends React.PureComponent ({ + advanced: { + ...state.advanced, + [field]: { + location: value, + }, + }, })); }; @@ -261,15 +269,20 @@ class CreateTaskContent extends React.PureComponent { const [project] = response; + const { advanced } = this.state; this.handleSubmitAdvancedConfiguration({ - ...this.state.advanced, - sourceStorage: new Storage(project.sourceStorage || { location: StorageLocation.LOCAL }), - targetStorage: new Storage(project.targetStorage || { location: StorageLocation.LOCAL }), + ...advanced, + sourceStorage: new Storage( + project.sourceStorage || { location: StorageLocation.LOCAL } + ), + targetStorage: new Storage( + project.targetStorage || { location: StorageLocation.LOCAL } + ), }); return Promise.resolve(); }) .catch((error: Error): void => { - throw new Error(`Couldn't fetch the project ${projectId} ` + error.toString()); + throw new Error(`Couldn't fetch the project ${projectId} ${error.toString()}`); }); } return Promise.resolve(); @@ -391,24 +404,22 @@ class CreateTaskContent extends React.PureComponent ({ - advanced: { - ...state.advanced, - [field]: { - location: value, - } - } - })); - } - private renderAdvancedBlock(): JSX.Element { const { installedGit, dumpers } = this.props; const { activeFileManagerTab, projectId } = this.state; - const {useProjectSourceStorage, useProjectTargetStorage } = this.state.advanced; - const { location: sourceStorageLocation } = this.state.advanced.sourceStorage; - const { location: targetStorageLocation } = this.state.advanced.targetStorage; + const { + advanced: { + useProjectSourceStorage, + useProjectTargetStorage, + sourceStorage: { + location: sourceStorageLocation, + }, + targetStorage: { + location: targetStorageLocation, + }, + }, + } = this.state; return ( diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index cddc273fbca..42867adf738 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -67,11 +67,10 @@ function ExportBackupModal(): JSX.Element { }, [instance?.id, instance?.targetStorage]); useEffect(() => { - setHelpMessage( - // eslint-disable-next-line prefer-template - `Export backup to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + - `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}` - ); + // eslint-disable-next-line prefer-template + const message = `Export backup to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + + `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`; + setHelpMessage(message); }, [defaultStorageLocation, defaultStorageCloudId]); const closeModal = (): void => { diff --git a/cvat-ui/src/components/projects-page/actions-menu.tsx b/cvat-ui/src/components/projects-page/actions-menu.tsx index 9e369d6a12b..4854bf92760 100644 --- a/cvat-ui/src/components/projects-page/actions-menu.tsx +++ b/cvat-ui/src/components/projects-page/actions-menu.tsx @@ -21,9 +21,9 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element { const { projectInstance } = props; const dispatch = useDispatch(); - const exportBackupIsActive = useSelector((state: CombinedState) => { - return state.export.projects.backup.current[projectInstance.id]; - }); + const exportBackupIsActive = useSelector((state: CombinedState) => ( + state.export.projects.backup.current[projectInstance.id] + )); const onDeleteProject = useCallback((): void => { Modal.confirm({ diff --git a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js index ea2f7174fe6..a20123c552b 100644 --- a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js +++ b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js @@ -102,7 +102,7 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { it('Upload annotation to job.', () => { cy.interactMenu('Upload annotations'); - cy.get('.cvat-modal-import-dataset') + cy.get('.cvat-modal-import-dataset'); cy.get('.cvat-modal-import-select').click(); cy.contains('.cvat-modal-import-dataset-option-item', exportFormat.split(' ')[0]).click(); cy.get('.cvat-modal-import-select').should('contain.text', exportFormat.split(' ')[0]); diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js index a37d29f2b86..01d924bac71 100644 --- a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js +++ b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js @@ -47,8 +47,8 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden').within(() => { cy.get('.rc-virtual-list-holder') - .contains('.cvat-modal-import-dataset-option-item', format) - .click(); + .contains('.cvat-modal-import-dataset-option-item', format) + .click(); }); cy.get('.cvat-modal-import-select').should('contain.text', format); cy.get('input[type="file"]').attachFile(file, { subjectType: 'drag-n-drop' }); @@ -59,7 +59,6 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox cy.closeNotification('.cvat-notification-notice-import-annotation-start'); } - before(() => { cy.visit('auth/login'); cy.login(); @@ -116,7 +115,7 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox uploadAnnotation( dumpType.split(' ')[0], annotationArchiveName, - '.cvat-modal-content-load-job-annotation' + '.cvat-modal-content-load-job-annotation', ); cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js index e9f24e061b2..423ab20b8a7 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js @@ -80,7 +80,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', uploadAnnotation( dumpTypePC.split(' ')[0], annotationPCArchiveName, - '.cvat-modal-content-load-job-annotation' + '.cvat-modal-content-load-job-annotation', ); cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); @@ -101,7 +101,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', uploadAnnotation( dumpTypePC.split(' ')[0], annotationPCArchiveName, - '.cvat-modal-content-load-task-annotation' + '.cvat-modal-content-load-task-annotation', ); cy.contains('Annotations have been loaded').should('be.visible'); cy.closeNotification('.ant-notification-notice-info'); diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js index 34c859edc05..cfbb20223dd 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js @@ -80,7 +80,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form uploadAnnotation( dumpTypeVC.split(' ')[0], annotationVCArchiveName, - '.cvat-modal-content-load-job-annotation' + '.cvat-modal-content-load-job-annotation', ); cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); @@ -101,7 +101,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form uploadAnnotation( dumpTypeVC.split(' ')[0], annotationVCArchiveNameCustomeName, - '.cvat-modal-content-load-task-annotation' + '.cvat-modal-content-load-task-annotation', ); cy.contains('Annotations have been loaded').should('be.visible'); cy.closeNotification('.ant-notification-notice-info'); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index fda833317ad..d01c2a57c7c 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -868,8 +868,8 @@ Cypress.Commands.add('shapeRotate', (shape, expectedRotateDeg, pressShift = fals .trigger('mousemove') .trigger('mouseover') .should('have.class', 'cvat_canvas_shape_activated'); - cy.get('.svg_select_points_rot').then($el => { - let {x, y, width, height} = $el[0].getBoundingClientRect(); + cy.get('.svg_select_points_rot').then(($el) => { + let { x, y, width, height } = $el[0].getBoundingClientRect(); x += width / 2; y += height / 2; From 589f38c2173c5528ae59146d2ce8f344371c2925 Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 1 Sep 2022 19:01:18 +0200 Subject: [PATCH 34/60] Combine uploadAnnotations and importDataset --- cvat-core/src/annotations.ts | 40 +++++++++++++++++------------------- cvat-core/src/session.ts | 18 ++++++++-------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts index a5917ce471f..abe37d77ade 100644 --- a/cvat-core/src/annotations.ts +++ b/cvat-core/src/annotations.ts @@ -223,18 +223,7 @@ export function selectObject(session, objectStates, x, y) { ); } -export async function uploadAnnotations( - session, - format: string, - useDefaultLocation: boolean, - sourceStorage: Storage, - file: File | string -) { - const sessionType = session instanceof Task ? 'task' : 'job'; - await serverProxy.annotations.uploadAnnotations(sessionType, session.id, format, useDefaultLocation, sourceStorage, file); -} - -export function importAnnotations(session, data) { +export function importCollection(session, data) { const sessionType = session instanceof Task ? 'task' : 'job'; const cache = getCache(sessionType); @@ -248,7 +237,7 @@ export function importAnnotations(session, data) { ); } -export function exportAnnotations(session) { +export function exportCollection(session) { const sessionType = session instanceof Task ? 'task' : 'job'; const cache = getCache(sessionType); @@ -285,13 +274,16 @@ export async function exportDataset( return result; } -export function importDataset(instance, format: string, useDefaultSettings: boolean, sourceStorage: Storage, - file: File | string, updateStatusCallback = () => {}) { - if (!(typeof format === 'string')) { - throw new ArgumentError('Format must be a string'); - } - if (!(instance instanceof Project)) { - throw new ArgumentError('Instance should be a Project instance'); +export function importDataset( + instance: any, + format: string, + useDefaultSettings: boolean, + sourceStorage: Storage, + file: File | string, + updateStatusCallback = () => {} +) { + if (!(instance instanceof Project || instance instanceof Task || instance instanceof Job)) { + throw new ArgumentError('Instance should be a Project || Task || Job instance'); } if (!(typeof updateStatusCallback === 'function')) { throw new ArgumentError('Callback should be a function'); @@ -302,7 +294,13 @@ export function importDataset(instance, format: string, useDefaultSettings: bool if (file instanceof File && !(['application/zip', 'application/x-zip-compressed'].includes(file.type))) { throw new ArgumentError('File should be file instance with ZIP extension'); } - return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); + + if (instance instanceof Project) { + return serverProxy.projects.importDataset(instance.id, format, useDefaultSettings, sourceStorage, file, updateStatusCallback); + } + + const instanceType = instance instanceof Task ? 'task' : 'job'; + return serverProxy.annotations.uploadAnnotations(instanceType, instance.id, format, useDefaultSettings, sourceStorage, file); } export function getHistory(session) { diff --git a/cvat-core/src/session.ts b/cvat-core/src/session.ts index 3fdd79d5bfe..601a157f31b 100644 --- a/cvat-core/src/session.ts +++ b/cvat-core/src/session.ts @@ -1952,9 +1952,9 @@ const { clearAnnotations, selectObject, annotationsStatistics, - uploadAnnotations, - importAnnotations, - exportAnnotations, + importCollection, + exportCollection, + importDataset, exportDataset, undoActions, redoActions, @@ -2231,17 +2231,17 @@ Job.prototype.annotations.upload.implementation = async function ( sourceStorage: Storage, file: File | string, ) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); + const result = await importDataset(this, format, useDefaultLocation, sourceStorage, file); return result; }; Job.prototype.annotations.import.implementation = function (data) { - const result = importAnnotations(this, data); + const result = importCollection(this, data); return result; }; Job.prototype.annotations.export.implementation = function () { - const result = exportAnnotations(this); + const result = exportCollection(this); return result; }; @@ -2668,17 +2668,17 @@ Task.prototype.annotations.upload.implementation = async function ( sourceStorage: Storage, file: File | string, ) { - const result = await uploadAnnotations(this, format, useDefaultLocation, sourceStorage, file); + const result = await importDataset(this, format, useDefaultLocation, sourceStorage, file); return result; }; Task.prototype.annotations.import.implementation = function (data) { - const result = importAnnotations(this, data); + const result = importCollection(this, data); return result; }; Task.prototype.annotations.export.implementation = function () { - const result = exportAnnotations(this); + const result = exportCollection(this); return result; }; From 0f2153c54fe264697c12936b4f2053044d77ba9f Mon Sep 17 00:00:00 2001 From: Maya Date: Thu, 1 Sep 2022 19:12:40 +0200 Subject: [PATCH 35/60] Fix annotation uploading from local --- cvat/apps/engine/mixins.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cvat/apps/engine/mixins.py b/cvat/apps/engine/mixins.py index fa4e6153f8f..d4ec577de4e 100644 --- a/cvat/apps/engine/mixins.py +++ b/cvat/apps/engine/mixins.py @@ -279,6 +279,11 @@ def export_annotations(self, request, pk, db_obj, export_func, callback, get_dat return Response(serializer.data) def import_annotations(self, request, pk, db_obj, import_func, rq_func, rq_id): + is_tus_request = request.headers.get('Upload-Length', None) is not None or \ + request.method == 'OPTIONS' + if is_tus_request: + return self.init_tus_upload(request) + use_default_location = request.query_params.get('use_default_location', True) use_settings = strtobool(str(use_default_location)) obj = db_obj if use_settings else request.query_params From d5cd18bb302c42647f8c443e273d9c5b04b8a7ea Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 2 Sep 2022 10:52:26 +0200 Subject: [PATCH 36/60] Update tests --- .../case_52_dump_upload_annotation.js | 4 ++-- ...3_import_annotations_frames_dots_in_name.js | 10 +++++----- .../actions_tasks3/case_47_export_dataset.js | 10 +++++----- ...ump_upload_annotation_point_cloud_format.js | 6 +++--- ...upload_annotation_velodyne_points_format.js | 6 +++--- ...93_canvas3d_functionality_export_dataset.js | 8 ++++---- .../issue_1568_cuboid_dump_annotation.js | 2 +- tests/cypress/support/commands.js | 18 ++++++++++++++++++ 8 files changed, 41 insertions(+), 23 deletions(-) diff --git a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js index a20123c552b..356039f26d2 100644 --- a/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js +++ b/tests/cypress/integration/actions_tasks/case_52_dump_upload_annotation.js @@ -74,7 +74,7 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { format: exportFormat, archiveCustomeName: 'task_export_annotation_custome_name', }; - cy.exportTask(exportAnnotationRenameArchive); + cy.exportJob(exportAnnotationRenameArchive); cy.getDownloadFileName().then((file) => { annotationArchiveNameCustomeName = file; cy.verifyDownload(annotationArchiveNameCustomeName); @@ -88,7 +88,7 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => { type: 'annotations', format: exportFormat, }; - cy.exportTask(exportAnnotation); + cy.exportJob(exportAnnotation); cy.getDownloadFileName().then((file) => { annotationArchiveName = file; cy.verifyDownload(annotationArchiveName); diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js index 01d924bac71..81f6c36f903 100644 --- a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js +++ b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js @@ -83,8 +83,8 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox describe(`Testing case "${issueId}"`, () => { it('Save job. Dump annotation to YOLO format. Remove annotation. Save job.', () => { cy.saveJob('PATCH', 200, 'saveJobDump'); - cy.intercept('GET', '/api/tasks/**/annotations**').as('dumpAnnotations'); - cy.interactMenu('Export task dataset'); + cy.intercept('GET', '/api/jobs/**/annotations**').as('dumpAnnotations'); + cy.interactMenu('Export job dataset'); cy.get('.cvat-modal-export-select').click(); cy.get('.ant-select-dropdown') .not('.ant-select-dropdown-hidden'); @@ -92,9 +92,9 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox .contains('.cvat-modal-export-option-item', dumpType) .click(); cy.get('.cvat-modal-export-select').should('contain.text', dumpType); - cy.get('.cvat-modal-export-task').contains('button', 'OK').click(); - cy.get('.cvat-notification-notice-export-task-start').should('be.visible'); - cy.closeNotification('.cvat-notification-notice-export-task-start'); + cy.get('.cvat-modal-export-job').contains('button', 'OK').click(); + cy.get('.cvat-notification-notice-export-job-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-export-job-start'); cy.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202); cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201); cy.verifyNotification(); diff --git a/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js b/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js index fe6eaae5687..8454b903d86 100644 --- a/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js +++ b/tests/cypress/integration/actions_tasks3/case_47_export_dataset.js @@ -26,24 +26,24 @@ context('Export task dataset.', () => { }); describe(`Testing case "${caseId}"`, () => { - it('Export a task as dataset.', () => { + it('Export a job as dataset.', () => { const exportDataset = { as: 'exportDataset', type: 'dataset', format: exportFormat, }; - cy.exportTask(exportDataset); + cy.exportJob(exportDataset); cy.waitForDownload(); }); - it('Export a task as dataset with renaming the archive.', () => { + it('Export a job as dataset with renaming the archive.', () => { const exportDataset = { as: 'exportDatasetRenameArchive', type: 'dataset', format: exportFormat, - archiveCustomeName: 'task_export_dataset_custome_name', + archiveCustomeName: 'job_export_dataset_custome_name', }; - cy.exportTask(exportDataset); + cy.exportJob(exportDataset); cy.waitForDownload(); }); }); diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js index 423ab20b8a7..5f16d263cf4 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js @@ -49,7 +49,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', type: 'annotations', format: dumpTypePC, }; - cy.exportTask(exportAnnotation); + cy.exportJob(exportAnnotation); cy.getDownloadFileName().then((file) => { annotationPCArchiveName = file; cy.verifyDownload(annotationPCArchiveName); @@ -62,9 +62,9 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', as: 'exportAnnotationsRenameArchive', type: 'annotations', format: dumpTypePC, - archiveCustomeName: 'task_export_3d_annotation_custome_name_pc_format', + archiveCustomeName: 'job_export_3d_annotation_custome_name_pc_format', }; - cy.exportTask(exportAnnotationRenameArchive); + cy.exportJob(exportAnnotationRenameArchive); cy.getDownloadFileName().then((file) => { annotationPCArchiveCustomeName = file; cy.verifyDownload(annotationPCArchiveCustomeName); diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js index cfbb20223dd..022491ce6b7 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js @@ -49,7 +49,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form type: 'annotations', format: dumpTypeVC, }; - cy.exportTask(exportAnnotation); + cy.exportJob(exportAnnotation); cy.getDownloadFileName().then((file) => { annotationVCArchiveName = file; cy.verifyDownload(annotationVCArchiveName); @@ -62,9 +62,9 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form as: 'exportAnnotationsRenameArchive', type: 'annotations', format: dumpTypeVC, - archiveCustomeName: 'task_export_3d_annotation_custome_name_vc_format', + archiveCustomeName: 'job_export_3d_annotation_custome_name_vc_format', }; - cy.exportTask(exportAnnotationRenameArchive); + cy.exportJob(exportAnnotationRenameArchive); cy.getDownloadFileName().then((file) => { annotationVCArchiveNameCustomeName = file; cy.verifyDownload(annotationVCArchiveNameCustomeName); diff --git a/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js b/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js index 5b003fb7ff8..c44a710bfa5 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js +++ b/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js @@ -30,7 +30,7 @@ context('Canvas 3D functionality. Export as a dataset.', () => { type: 'dataset', format: dumpTypePC, }; - cy.exportTask(exportDatasetPCFormat); + cy.exportJob(exportDatasetPCFormat); cy.waitForDownload(); }); @@ -40,7 +40,7 @@ context('Canvas 3D functionality. Export as a dataset.', () => { type: 'dataset', format: dumpTypeVC, }; - cy.exportTask(exportDatasetVCFormat); + cy.exportJob(exportDatasetVCFormat); cy.waitForDownload(); }); @@ -49,9 +49,9 @@ context('Canvas 3D functionality. Export as a dataset.', () => { as: 'exportDatasetVCFormatRenameArchive', type: 'dataset', format: dumpTypeVC, - archiveCustomeName: 'task_export_3d_dataset_custome_name_vc_format', + archiveCustomeName: 'job_export_3d_dataset_custome_name_vc_format', }; - cy.exportTask(exportDatasetVCFormatRenameArchive); + cy.exportJob(exportDatasetVCFormatRenameArchive); cy.waitForDownload(); cy.removeAnnotations(); cy.saveJob('PUT'); diff --git a/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js b/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js index 5e6f9248a42..3869ac985e0 100644 --- a/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js +++ b/tests/cypress/integration/issues_prs2/issue_1568_cuboid_dump_annotation.js @@ -35,7 +35,7 @@ context('Dump annotation if cuboid created.', () => { type: 'annotations', format: exportFormat, }; - cy.exportTask(exportAnnotation); + cy.exportJob(exportAnnotation); cy.waitForDownload(); }); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index d01c2a57c7c..9c558c746f8 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -855,6 +855,24 @@ Cypress.Commands.add('exportTask', ({ cy.closeNotification('.cvat-notification-notice-export-task-start'); }); +Cypress.Commands.add('exportJob', ({ + type, format, archiveCustomeName, +}) => { + cy.interactMenu('Export job dataset'); + cy.get('.cvat-modal-export-job').should('be.visible').find('.cvat-modal-export-select').click(); + cy.contains('.cvat-modal-export-option-item', format).should('be.visible').click(); + cy.get('.cvat-modal-export-job').find('.cvat-modal-export-select').should('contain.text', format); + if (type === 'dataset') { + cy.get('.cvat-modal-export-job').find('.cvat-modal-export-save-images').should('not.be.checked').click(); + } + if (archiveCustomeName) { + cy.get('.cvat-modal-export-job').find('.cvat-modal-export-filename-input').type(archiveCustomeName); + } + cy.contains('button', 'OK').click(); + cy.get('.cvat-notification-notice-export-job-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-export-job-start'); +}); + Cypress.Commands.add('renameTask', (oldName, newName) => { cy.get('.cvat-task-details-task-name').within(() => { cy.get('[aria-label="edit"]').click(); From d92293c08896f9d4c7d6e49ec19121acdf88fb12 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 2 Sep 2022 14:28:37 +0200 Subject: [PATCH 37/60] Fix annotation uploading --- cvat/apps/engine/views.py | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index 9d4b88247f9..2cb46607e9a 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -72,6 +72,7 @@ from cvat.apps.engine.utils import av_scan_paths, process_failed_job, configure_dependent_job from cvat.apps.engine import backup from cvat.apps.engine.mixins import PartialUpdateModelMixin, UploadMixin, AnnotationMixin, SerializeMixin +from cvat.apps.engine.location import get_location_configuration, StorageType from . import models, task from .log import clogger, slogger @@ -841,7 +842,6 @@ def get_upload_dir(self): # UploadMixin method def upload_finished(self, request): if self.action == 'annotations': - # db_task = self.get_object() format_name = request.query_params.get("format", "") filename = request.query_params.get("filename", "") tmp_dir = self._object.get_tmp_dirname() @@ -1077,13 +1077,18 @@ def annotations(self, request, pk): elif request.method == 'PUT': format_name = request.query_params.get('format') if format_name: - return self.import_annotations( + use_settings = strtobool(str(request.query_params.get('use_default_location', True))) + obj = self._object if use_settings else request.query_params + location_conf = get_location_configuration( + obj=obj, use_settings=use_settings, field_name=StorageType.SOURCE + ) + return _import_annotations( request=request, - pk=pk, - db_obj=self._object, - import_func=_import_annotations, + rq_id="{}@/api/tasks/{}/annotations/upload".format(request.user, pk), rq_func=dm.task.import_task_annotations, - rq_id="{}@/api/tasks/{}/annotations/upload".format(request.user, pk) + pk=pk, + format_name=format_name, + location_conf=location_conf ) else: serializer = LabeledDataSerializer(data=request.data) @@ -1422,13 +1427,18 @@ def annotations(self, request, pk): elif request.method == 'PUT': format_name = request.query_params.get('format', '') if format_name: - return self.import_annotations( + use_settings = strtobool(str(request.query_params.get('use_default_location', True))) + obj = self._object.segment.task if use_settings else request.query_params + location_conf = get_location_configuration( + obj=obj, use_settings=use_settings, field_name=StorageType.SOURCE + ) + return _import_annotations( request=request, - pk=pk, - db_obj=self._object.segment.task, - import_func=_import_annotations, + rq_id="{}@/api/jobs/{}/annotations/upload".format(request.user, pk), rq_func=dm.task.import_job_annotations, - rq_id="{}@/api/jobs/{}/annotations/upload".format(request.user, pk) + pk=pk, + format_name=format_name, + location_conf=location_conf ) else: serializer = LabeledDataSerializer(data=request.data) From 49be69f8e0e28a45c7bef73416dfa99564344ecd Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 2 Sep 2022 16:04:52 +0200 Subject: [PATCH 38/60] Fix notification --- cvat-ui/src/reducers/notifications-reducer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 821dcb4a494..6bdb2c2eb07 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -400,7 +400,7 @@ export default function (state = defaultState, action: AnyAction): Notifications }; } case ExportActionTypes.EXPORT_BACKUP_FAILED: { - const { instanceId, instanceType } = action.payload; + const { instance, instanceType } = action.payload; return { ...state, errors: { @@ -409,7 +409,7 @@ export default function (state = defaultState, action: AnyAction): Notifications ...state.errors.exporting, backup: { message: - `Could not export the ${instanceType} №${instanceId}`, + `Could not export the ${instanceType} №${instance.id}`, reason: action.payload.error.toString(), }, }, From 051ea12344ea505aa5db5e4e507ca146f212d7a1 Mon Sep 17 00:00:00 2001 From: Maya Date: Fri, 2 Sep 2022 16:39:12 +0200 Subject: [PATCH 39/60] Update dependencies --- cvat-ui/src/actions/export-actions.ts | 7 +++++-- .../src/components/export-backup/export-backup-modal.tsx | 6 +++--- .../components/export-dataset/export-dataset-modal.tsx | 8 ++++---- .../components/import-dataset/import-dataset-modal.tsx | 6 +++--- cvat-ui/src/reducers/notifications-reducer.ts | 5 ++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 2015b34d983..357028f8796 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -37,12 +37,14 @@ export const exportActions = { instanceType: 'project' | 'task' | 'job', format: string, isLocal: boolean, + resource: 'Dataset' | 'Annotations', ) => ( createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, { instance, instanceType, format, - isLocal + isLocal, + resource, }) ), exportDatasetFailed: (instance: any, instanceType: 'project' | 'task' | 'job', format: string, error: any) => ( @@ -97,7 +99,8 @@ export const exportDatasetAsync = ( downloadAnchor.href = result; downloadAnchor.click(); } - dispatch(exportActions.exportDatasetSuccess(instance, instanceType, format, !!result)); + const resource = saveImages ? 'Dataset' : 'Annotations'; + dispatch(exportActions.exportDatasetSuccess(instance, instanceType, format, !!result, resource)); } catch (error) { dispatch(exportActions.exportDatasetFailed(instance, instanceType, format, error)); } diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index 42867adf738..23de930d59b 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -57,14 +57,14 @@ function ExportBackupModal(): JSX.Element { } else if (instance instanceof core.classes.Task) { setInstanceType(`task #${instance.id}`); } - }, [instance?.id, instance instanceof core.classes.Project]); + }, [instance]); useEffect(() => { if (instance) { setDefaultStorageLocation(instance.targetStorage?.location || StorageLocation.LOCAL); setDefaultStorageCloudId(instance.targetStorage?.cloudStorageId || null); } - }, [instance?.id, instance?.targetStorage]); + }, [instance]); useEffect(() => { // eslint-disable-next-line prefer-template @@ -106,7 +106,7 @@ function ExportBackupModal(): JSX.Element { className: 'cvat-notification-notice-export-backup-start', }); }, - [instance, instanceType, useDefaultStorage], + [instance, useDefaultStorage], ); return ( diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 8e2af1991a1..8048b843419 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -75,7 +75,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { form.setFieldsValue({ selectedFormat: 'CVAT for images 1.1' }); } } - }, [instance?.id, instance instanceof core.classes.Project]); + }, [instance]); useEffect(() => { if (instance) { @@ -101,7 +101,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { }); } } - }, [instance?.id, instance?.targetStorage]); + }, [instance]); useEffect(() => { // eslint-disable-next-line prefer-template @@ -133,7 +133,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { ), ); closeModal(); - const resource = instanceType.includes('project') ? 'Dataset' : 'Annotations'; + const resource = values.saveImages ? 'Dataset' : 'Annotations'; Notification.info({ message: `${resource} export started`, description: @@ -142,7 +142,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { className: `cvat-notification-notice-export-${instanceType.split(' ')[0]}-start`, }); }, - [instance, instanceType, targetStorage], + [instance, useDefaultTargetStorage, targetStorage], ); return ( diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 1eb80a3c814..f00bd77e327 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -134,7 +134,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { setInstanceType(`job #${instance.id}`); } } - }, [instance?.id, resource, instance?.sourceStorage]); + }, [instance, resource]); useEffect(() => { setHelpMessage( @@ -273,7 +273,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { const handleImport = useCallback( (values: FormValues): void => { - if (file === null && !values.fileName) { + if (uploadParams.file === null && !values.fileName) { Notification.error({ message: `No ${uploadParams.resource} file specified`, }); @@ -287,7 +287,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { } closeModal(); }, - [instance?.id, uploadParams], + [instance, uploadParams], ); return ( diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 6bdb2c2eb07..4abcf686512 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -382,9 +382,8 @@ export default function (state = defaultState, action: AnyAction): Notifications }; } case ExportActionTypes.EXPORT_DATASET_SUCCESS: { - const { instance, instanceType, isLocal } = action.payload; - const resource = instanceType === 'project' ? 'Dataset' : 'Annotations'; - const auxiliaryVerb = instanceType === 'project' ? 'has' : 'have'; + const { instance, instanceType, isLocal, resource } = action.payload; + const auxiliaryVerb = resource === 'Dataset' ? 'has' : 'have'; return { ...state, messages: { From 486c1fadb1b47d894d864af84a8c8d967ef2718c Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 5 Sep 2022 10:13:13 +0200 Subject: [PATCH 40/60] fix --- cvat-ui/src/components/export-backup/export-backup-modal.tsx | 2 +- cvat-ui/src/components/export-dataset/export-dataset-modal.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat-ui/src/components/export-backup/export-backup-modal.tsx b/cvat-ui/src/components/export-backup/export-backup-modal.tsx index 23de930d59b..dc53cb71d16 100644 --- a/cvat-ui/src/components/export-backup/export-backup-modal.tsx +++ b/cvat-ui/src/components/export-backup/export-backup-modal.tsx @@ -106,7 +106,7 @@ function ExportBackupModal(): JSX.Element { className: 'cvat-notification-notice-export-backup-start', }); }, - [instance, useDefaultStorage], + [instance, useDefaultStorage, defaultStorageLocation, defaultStorageCloudId], ); return ( diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 8048b843419..9400f0d7115 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -142,7 +142,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { className: `cvat-notification-notice-export-${instanceType.split(' ')[0]}-start`, }); }, - [instance, useDefaultTargetStorage, targetStorage], + [instance, instanceType, useDefaultTargetStorage, defaultStorageLocation, defaultStorageCloudId, targetStorage], ); return ( From e78db23b6e2f905fab4e18d72de1863792c6d791 Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 5 Sep 2022 14:23:22 +0200 Subject: [PATCH 41/60] Update jest tests --- cvat-core/tests/api/annotations.js | 9 ++- cvat-core/tests/api/cloud-storages.js | 7 +- cvat-core/tests/api/frames.js | 7 +- cvat-core/tests/api/jobs.js | 7 +- cvat-core/tests/api/object-state.js | 7 +- cvat-core/tests/api/plugins.js | 7 +- cvat-core/tests/api/projects.js | 9 ++- cvat-core/tests/api/server.js | 93 ++++++++++++++------------- cvat-core/tests/api/tasks.js | 7 +- cvat-core/tests/api/user.js | 7 +- 10 files changed, 95 insertions(+), 65 deletions(-) diff --git a/cvat-core/tests/api/annotations.js b/cvat-core/tests/api/annotations.js index de2b1257c3f..e0d074f3373 100644 --- a/cvat-core/tests/api/annotations.js +++ b/cvat-core/tests/api/annotations.js @@ -1,17 +1,20 @@ // Copyright (C) 2020-2022 Intel Corporation // Copyright (C) 2022 CVAT.ai Corp +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api window.cvat = require('../../src/api'); -const serverProxy = require('../../src/server-proxy'); +const serverProxy = require('../../src/server-proxy').default; // Test cases describe('Feature: get annotations', () => { diff --git a/cvat-core/tests/api/cloud-storages.js b/cvat-core/tests/api/cloud-storages.js index 66ccf11abdc..a53d34d8d93 100644 --- a/cvat-core/tests/api/cloud-storages.js +++ b/cvat-core/tests/api/cloud-storages.js @@ -1,11 +1,14 @@ // Copyright (C) 2021-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/frames.js b/cvat-core/tests/api/frames.js index e758da7084f..a707e4ea181 100644 --- a/cvat-core/tests/api/frames.js +++ b/cvat-core/tests/api/frames.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/jobs.js b/cvat-core/tests/api/jobs.js index 568a96f39ac..3adcdb7f114 100644 --- a/cvat-core/tests/api/jobs.js +++ b/cvat-core/tests/api/jobs.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/object-state.js b/cvat-core/tests/api/object-state.js index bb86279e855..0d15ca43d11 100644 --- a/cvat-core/tests/api/object-state.js +++ b/cvat-core/tests/api/object-state.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/plugins.js b/cvat-core/tests/api/plugins.js index 373adc48c3f..1f2949abee5 100644 --- a/cvat-core/tests/api/plugins.js +++ b/cvat-core/tests/api/plugins.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/projects.js b/cvat-core/tests/api/projects.js index ea278c24146..9c9426104da 100644 --- a/cvat-core/tests/api/projects.js +++ b/cvat-core/tests/api/projects.js @@ -1,17 +1,20 @@ // Copyright (C) 2019-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api window.cvat = require('../../src/api'); -const { Project } = require('../../src/project'); +const Project = require('../../src/project').default; describe('Feature: get projects', () => { test('get all projects', async () => { diff --git a/cvat-core/tests/api/server.js b/cvat-core/tests/api/server.js index cab2b203e3a..d775d89e540 100644 --- a/cvat-core/tests/api/server.js +++ b/cvat-core/tests/api/server.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api @@ -23,51 +26,51 @@ describe('Feature: get info about cvat', () => { }); }); -describe('Feature: get share storage info', () => { - test('get files in a root of a share storage', async () => { - const result = await window.cvat.server.share(); - expect(Array.isArray(result)).toBeTruthy(); - expect(result).toHaveLength(5); - }); +// describe('Feature: get share storage info', () => { +// test('get files in a root of a share storage', async () => { +// const result = await window.cvat.server.share(); +// expect(Array.isArray(result)).toBeTruthy(); +// expect(result).toHaveLength(5); +// }); - test('get files in a some dir of a share storage', async () => { - const result = await window.cvat.server.share('images'); - expect(Array.isArray(result)).toBeTruthy(); - expect(result).toHaveLength(8); - }); +// test('get files in a some dir of a share storage', async () => { +// const result = await window.cvat.server.share('images'); +// expect(Array.isArray(result)).toBeTruthy(); +// expect(result).toHaveLength(8); +// }); - test('get files in a some unknown dir of a share storage', async () => { - expect(window.cvat.server.share('Unknown Directory')).rejects.toThrow(window.cvat.exceptions.ServerError); - }); -}); +// test('get files in a some unknown dir of a share storage', async () => { +// expect(window.cvat.server.share('Unknown Directory')).rejects.toThrow(window.cvat.exceptions.ServerError); +// }); +// }); -describe('Feature: get annotation formats', () => { - test('get annotation formats from a server', async () => { - const result = await window.cvat.server.formats(); - expect(result).toBeInstanceOf(AnnotationFormats); - }); -}); +// describe('Feature: get annotation formats', () => { +// test('get annotation formats from a server', async () => { +// const result = await window.cvat.server.formats(); +// expect(result).toBeInstanceOf(AnnotationFormats); +// }); +// }); -describe('Feature: get annotation loaders', () => { - test('get annotation formats from a server', async () => { - const result = await window.cvat.server.formats(); - expect(result).toBeInstanceOf(AnnotationFormats); - const { loaders } = result; - expect(Array.isArray(loaders)).toBeTruthy(); - for (const loader of loaders) { - expect(loader).toBeInstanceOf(Loader); - } - }); -}); +// describe('Feature: get annotation loaders', () => { +// test('get annotation formats from a server', async () => { +// const result = await window.cvat.server.formats(); +// expect(result).toBeInstanceOf(AnnotationFormats); +// const { loaders } = result; +// expect(Array.isArray(loaders)).toBeTruthy(); +// for (const loader of loaders) { +// expect(loader).toBeInstanceOf(Loader); +// } +// }); +// }); -describe('Feature: get annotation dumpers', () => { - test('get annotation formats from a server', async () => { - const result = await window.cvat.server.formats(); - expect(result).toBeInstanceOf(AnnotationFormats); - const { dumpers } = result; - expect(Array.isArray(dumpers)).toBeTruthy(); - for (const dumper of dumpers) { - expect(dumper).toBeInstanceOf(Dumper); - } - }); -}); +// describe('Feature: get annotation dumpers', () => { +// test('get annotation formats from a server', async () => { +// const result = await window.cvat.server.formats(); +// expect(result).toBeInstanceOf(AnnotationFormats); +// const { dumpers } = result; +// expect(Array.isArray(dumpers)).toBeTruthy(); +// for (const dumper of dumpers) { +// expect(dumper).toBeInstanceOf(Dumper); +// } +// }); +// }); diff --git a/cvat-core/tests/api/tasks.js b/cvat-core/tests/api/tasks.js index bbb990c81cf..7321824b768 100644 --- a/cvat-core/tests/api/tasks.js +++ b/cvat-core/tests/api/tasks.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api diff --git a/cvat-core/tests/api/user.js b/cvat-core/tests/api/user.js index 14623b77b3c..694aa61e943 100644 --- a/cvat-core/tests/api/user.js +++ b/cvat-core/tests/api/user.js @@ -1,11 +1,14 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT // Setup mock for a server jest.mock('../../src/server-proxy', () => { - const mock = require('../mocks/server-proxy.mock'); - return mock; + return { + __esModule: true, + default: require('../mocks/server-proxy.mock'), + }; }); // Initialize api From 53f373005926ccc5a9cba2dfa50f4bb566c8b91b Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 5 Sep 2022 14:30:01 +0200 Subject: [PATCH 42/60] Skip error notification when no permissions --- .../import-dataset/import-dataset-modal.tsx | 145 +++++++++--------- 1 file changed, 71 insertions(+), 74 deletions(-) diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index f00bd77e327..50eb53da603 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -87,13 +87,9 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { } }, [instanceT]); - const isDataset = useCallback((): boolean => { - return resource === 'dataset'; - }, [resource]); + const isDataset = useCallback((): boolean => resource === 'dataset', [resource]); - const isAnnotation = useCallback((): boolean => { - return resource === 'annotation'; - }, [resource]); + const isAnnotation = useCallback((): boolean => resource === 'annotation', [resource]); useEffect(() => { setUploadParams({ @@ -126,10 +122,12 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { } }) .catch((error: Error) => { - Notification.error({ - message: `Could not get task instance ${instance.taskId}`, - description: error.toString(), - }); + if ((error as any).code !== 403) { + Notification.error({ + message: `Could not get task instance ${instance.taskId}`, + description: error.toString(), + }); + } }); setInstanceType(`job #${instance.id}`); } @@ -140,45 +138,45 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { setHelpMessage( // eslint-disable-next-line prefer-template `Import from ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + - `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`); + `storage ${(defaultStorageCloudId) ? `№${defaultStorageCloudId}` : ''}`, + ); }, [defaultStorageLocation, defaultStorageCloudId]); - const uploadLocalFile = (): JSX.Element => { - return ( - { - if (!selectedLoader) { - message.warn('Please select a format first', 3); - } else if (isDataset() && !['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { - message.error('Only ZIP archive is supported for import a dataset'); - } else if (isAnnotation() && + const uploadLocalFile = (): JSX.Element => ( + { + if (!selectedLoader) { + message.warn('Please select a format first', 3); + } else if (isDataset() && !['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { + message.error('Only ZIP archive is supported for import a dataset'); + } else if (isAnnotation() && !selectedLoader.format.toLowerCase().split(', ').includes(_file.name.split('.')[_file.name.split('.').length - 1])) { - message.error( - `For ${selectedLoader.name} format only files with ` + - `${selectedLoader.format.toLowerCase()} extension can be used`); - } else { - setFile(_file); - setUploadParams({ - ...uploadParams, - file: _file, - } as UploadParams); - } - return false; - }} - onRemove={() => { - setFile(null); - }} - > -

    - -

    -

    Click or drag file to this area

    -     - ); - }; + message.error( + `For ${selectedLoader.name} format only files with ` + + `${selectedLoader.format.toLowerCase()} extension can be used`, + ); + } else { + setFile(_file); + setUploadParams({ + ...uploadParams, + file: _file, + } as UploadParams); + } + return false; + }} + onRemove={() => { + setFile(null); + }} + > +

    + +

    +

    Click or drag file to this area

    +     + ); const validateFileName = (_: RuleObject, value: string): Promise => { if (!selectedLoader) { @@ -192,7 +190,8 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { if (!allowedExtensions.includes(extension)) { return Promise.reject(new Error( `For ${selectedLoader.name} format only files with ` + - `${selectedLoader.format.toLowerCase()} extension can be used`)); + `${selectedLoader.format.toLowerCase()} extension can be used`, + )); } } if (isDataset()) { @@ -205,31 +204,29 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { return Promise.resolve(); }; - const renderCustomName = (): JSX.Element => { - return ( - File name} - name='fileName' - hasFeedback - dependencies={['selectedFormat']} - rules={[{ validator: validateFileName }]} - required - > - ) => { - if (e.target.value) { - setUploadParams({ - ...uploadParams, - fileName: e.target.value, - } as UploadParams); - } - }} - /> - - ); - }; + const renderCustomName = (): JSX.Element => ( + File name} + name='fileName' + hasFeedback + dependencies={['selectedFormat']} + rules={[{ validator: validateFileName }]} + required + > + ) => { + if (e.target.value) { + setUploadParams({ + ...uploadParams, + fileName: e.target.value, + } as UploadParams); + } + }} + /> + + ); const closeModal = useCallback((): void => { setUseDefaultSettings(true); @@ -244,8 +241,8 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { dispatch(importDatasetAsync( instance, uploadParams.selectedFormat as string, uploadParams.useDefaultSettings, uploadParams.sourceStorage, - uploadParams.file || uploadParams.fileName as string) - ); + uploadParams.file || uploadParams.fileName as string, + )); const resToPrint = uploadParams.resource.charAt(0).toUpperCase() + uploadParams.resource.slice(1); Notification.info({ message: `${resToPrint} import started`, From 042043b1e1931a5e4852ce938d10f3675f368e2c Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 5 Sep 2022 16:16:58 +0200 Subject: [PATCH 43/60] Update case 91 92 canvas3d tests --- ...d_functionality_dump_upload_annotation_point_cloud_format.js | 2 +- ...nctionality_dump_upload_annotation_velodyne_points_format.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js index 5f16d263cf4..654fe79d63a 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js @@ -76,13 +76,13 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', }); it('Upload "Point Cloud" format annotation to job.', () => { + cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.interactMenu('Upload annotations'); uploadAnnotation( dumpTypePC.split(' ')[0], annotationPCArchiveName, '.cvat-modal-content-load-job-annotation', ); - cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); cy.verifyNotification(); cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js index 022491ce6b7..73b41a6ae89 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js @@ -76,13 +76,13 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form }); it('Upload "Velodyne Points" format annotation to job.', () => { + cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.interactMenu('Upload annotations'); uploadAnnotation( dumpTypeVC.split(' ')[0], annotationVCArchiveName, '.cvat-modal-content-load-job-annotation', ); - cy.intercept('GET', '/api/jobs/**/annotations**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); cy.contains('Annotations have been loaded').should('be.visible'); cy.closeNotification('.ant-notification-notice-info'); From 6e0880efd6c9ca5744324f60b7e99fc4cc8617d2 Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 5 Sep 2022 22:36:46 +0200 Subject: [PATCH 44/60] Styles --- .../advanced-configuration-form.tsx | 10 ++++++++-- cvat-ui/src/components/create-task-page/styles.scss | 4 ++++ .../export-dataset/export-dataset-modal.tsx | 4 ++-- cvat-ui/src/components/export-dataset/styles.scss | 4 ++++ .../import-dataset/import-dataset-modal.tsx | 1 + cvat-ui/src/components/import-dataset/styles.scss | 4 ++++ .../storage/storage-with-switch-field.tsx | 13 ++++++------- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index cfc2e2afacd..0a55a33007a 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -358,6 +358,7 @@ class AdvancedConfigurationForm extends React.PureComponent { @@ -444,6 +445,7 @@ class AdvancedConfigurationForm extends React.PureComponent { @@ -458,8 +460,12 @@ class AdvancedConfigurationForm extends React.PureComponent { private renderCreateTaskMethod(): JSX.Element { return ( - - + + Use cache diff --git a/cvat-ui/src/components/create-task-page/styles.scss b/cvat-ui/src/components/create-task-page/styles.scss index 6cef28d30a9..c8c8896f10b 100644 --- a/cvat-ui/src/components/create-task-page/styles.scss +++ b/cvat-ui/src/components/create-task-page/styles.scss @@ -38,4 +38,8 @@ width: 100%; } } + + .cvat-settings-switch { + display: table-cell; + } } diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx index 9400f0d7115..675796fd306 100644 --- a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx +++ b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx @@ -106,7 +106,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { useEffect(() => { // eslint-disable-next-line prefer-template setHelpMessage(`Export to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + - `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`); + `storage ${(defaultStorageCloudId) ? `№${defaultStorageCloudId}` : ''}`); }, [defaultStorageLocation, defaultStorageCloudId]); const closeModal = (): void => { @@ -192,7 +192,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element { - + Save images diff --git a/cvat-ui/src/components/export-dataset/styles.scss b/cvat-ui/src/components/export-dataset/styles.scss index 40dba347530..ca37813e2e2 100644 --- a/cvat-ui/src/components/export-dataset/styles.scss +++ b/cvat-ui/src/components/export-dataset/styles.scss @@ -11,3 +11,7 @@ margin-right: $grid-unit-size; } } + +.cvat-modal-export-switch-use-default-storage { + display: table-cell; +} diff --git a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx index 50eb53da603..fc6c426ed6c 100644 --- a/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx +++ b/cvat-ui/src/components/import-dataset/import-dataset-modal.tsx @@ -375,6 +375,7 @@ function ImportDatasetModal(props: StateToProps): JSX.Element { { diff --git a/cvat-ui/src/components/import-dataset/styles.scss b/cvat-ui/src/components/import-dataset/styles.scss index ef72e86c280..14c9c3c0dbf 100644 --- a/cvat-ui/src/components/import-dataset/styles.scss +++ b/cvat-ui/src/components/import-dataset/styles.scss @@ -17,6 +17,10 @@ color: $text-color-secondary; } +.cvat-modal-import-switch-use-default-storage { + display: table-cell; +} + .cvat-modal-import-dataset-status .ant-modal-body { display: flex; align-items: center; diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index f6d1d73182c..bdbdd9f42fe 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -54,9 +54,9 @@ export default function StorageWithSwitchField(props: Props): JSX.Element { { if (onChangeUseDefaultStorage) { onChangeUseDefaultStorage(value); @@ -65,12 +65,11 @@ export default function StorageWithSwitchField(props: Props): JSX.Element { /> {switchDescription} - {(switchHelpMessage) ? ( - - - - ) : null - } + {(switchHelpMessage) ? ( + + + + ) : null} ) } From e3ceac66e6718767c306e4732cbecd7fe9d9a11f Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 00:20:44 +0200 Subject: [PATCH 45/60] Update icons --- .../create-task-page/advanced-configuration-form.tsx | 8 ++++---- .../src/components/storage/storage-with-switch-field.tsx | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx index 0a55a33007a..4796af1c107 100644 --- a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx +++ b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx @@ -5,7 +5,7 @@ import React, { RefObject } from 'react'; import { Row, Col } from 'antd/lib/grid'; -import { PercentageOutlined, QuestionCircleFilled } from '@ant-design/icons'; +import { PercentageOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import Input from 'antd/lib/input'; import Select from 'antd/lib/select'; import Space from 'antd/lib/space'; @@ -364,7 +364,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use LFS (Large File Support): - + ); @@ -451,7 +451,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use zip/video chunks - + ); @@ -469,7 +469,7 @@ class AdvancedConfigurationForm extends React.PureComponent { Use cache - + ); diff --git a/cvat-ui/src/components/storage/storage-with-switch-field.tsx b/cvat-ui/src/components/storage/storage-with-switch-field.tsx index bdbdd9f42fe..6ff6ddda541 100644 --- a/cvat-ui/src/components/storage/storage-with-switch-field.tsx +++ b/cvat-ui/src/components/storage/storage-with-switch-field.tsx @@ -9,7 +9,7 @@ import Text from 'antd/lib/typography/Text'; import Space from 'antd/lib/space'; import Switch from 'antd/lib/switch'; import Tooltip from 'antd/lib/tooltip'; -import { QuestionCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import CVATTooltip from 'components/common/cvat-tooltip'; import { StorageData } from 'cvat-core-wrapper'; import { StorageLocation } from 'reducers'; @@ -81,8 +81,7 @@ export default function StorageWithSwitchField(props: Props): JSX.Element { {storageLabel} - From c468d84bc106b56e766248c23d397196d72b6d5b Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 00:22:30 +0200 Subject: [PATCH 46/60] eslint --- .../import-backup/import-backup-modal.tsx | 81 ++++++++++--------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/cvat-ui/src/components/import-backup/import-backup-modal.tsx b/cvat-ui/src/components/import-backup/import-backup-modal.tsx index 82f9c4e5ea8..976da466f74 100644 --- a/cvat-ui/src/components/import-backup/import-backup-modal.tsx +++ b/cvat-ui/src/components/import-backup/import-backup-modal.tsx @@ -46,30 +46,28 @@ function ImportBackupModal(): JSX.Element { location: StorageLocation.LOCAL, }); - const uploadLocalFile = (): JSX.Element => { - return ( - { - if (!['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { - message.error('Only ZIP archive is supported'); - } else { - setFile(_file); - } - return false; - }} - onRemove={() => { - setFile(null); - }} - > -

    - -

    -

    Click or drag file to this area

    -     - ); - }; + const uploadLocalFile = (): JSX.Element => ( + { + if (!['application/zip', 'application/x-zip-compressed'].includes(_file.type)) { + message.error('Only ZIP archive is supported'); + } else { + setFile(_file); + } + return false; + }} + onRemove={() => { + setFile(null); + }} + > +

    + +

    +

    Click or drag file to this area

    +     + ); const validateFileName = (_: RuleObject, value: string): Promise => { if (value) { @@ -82,20 +80,18 @@ function ImportBackupModal(): JSX.Element { return Promise.resolve(); }; - const renderCustomName = (): JSX.Element => { - return ( - File name} - name='fileName' - rules={[{ validator: validateFileName }]} - > - - - ); - }; + const renderCustomName = (): JSX.Element => ( + File name} + name='fileName' + rules={[{ validator: validateFileName }]} + > + + + ); const closeModal = useCallback((): void => { setSelectedSourceStorage({ @@ -133,7 +129,14 @@ function ImportBackupModal(): JSX.Element { return ( <> Create {instanceType} from backup} + title={( + + Create + {instanceType} + {' '} + from backup + + )} visible={modalVisible} onCancel={closeModal} onOk={() => form.submit()} From 4d77e48f67038d74b5e6c23bb5bf5265b86b524e Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 00:29:28 +0200 Subject: [PATCH 47/60] eslint --- cvat-ui/src/actions/tasks-actions.ts | 2 +- .../create-project-content.tsx | 4 +-- .../create-task-page/create-task-content.tsx | 26 +++++++++---------- .../export-backup/export-backup-modal.tsx | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cvat-ui/src/actions/tasks-actions.ts b/cvat-ui/src/actions/tasks-actions.ts index b11bd471dfe..ace911b3adb 100644 --- a/cvat-ui/src/actions/tasks-actions.ts +++ b/cvat-ui/src/actions/tasks-actions.ts @@ -6,7 +6,7 @@ import { AnyAction, Dispatch, ActionCreator } from 'redux'; import { ThunkAction } from 'redux-thunk'; import { - TasksQuery,CombinedState, Indexable, StorageLocation + TasksQuery, CombinedState, Indexable, StorageLocation, } from 'reducers'; import { getCore, Storage } from 'cvat-core-wrapper'; import { getInferenceStatusAsync } from './models-actions'; diff --git a/cvat-ui/src/components/create-project-page/create-project-content.tsx b/cvat-ui/src/components/create-project-page/create-project-content.tsx index 0572fe8a42c..3f64ef0379f 100644 --- a/cvat-ui/src/components/create-project-page/create-project-content.tsx +++ b/cvat-ui/src/components/create-project-page/create-project-content.tsx @@ -219,10 +219,10 @@ export default function CreateProjectContent(): JSX.Element { ...advancedValues, name: basicValues.name, source_storage: new Storage( - advancedValues.sourceStorage || { location: StorageLocation.LOCAL, } + advancedValues.sourceStorage || { location: StorageLocation.LOCAL }, ).toJSON(), target_storage: new Storage( - advancedValues.targetStorage || { location: StorageLocation.LOCAL, } + advancedValues.targetStorage || { location: StorageLocation.LOCAL }, ).toJSON(), }; diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index 36565db1079..eefcc58964d 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -103,6 +103,17 @@ class CreateTaskContent extends React.PureComponent ({ + advanced: { + ...state.advanced, + [field]: { + location: value, + }, + }, + })); + } + private resetState = (): void => { this.basicConfigurationComponent.current?.resetFields(); this.advancedConfigurationComponent.current?.resetFields(); @@ -192,17 +203,6 @@ class CreateTaskContent extends React.PureComponent ({ - advanced: { - ...state.advanced, - [field]: { - location: value, - }, - }, - })); - }; - private focusToForm = (): void => { this.basicConfigurationComponent.current?.focus(); }; @@ -273,10 +273,10 @@ class CreateTaskContent extends React.PureComponent { // eslint-disable-next-line prefer-template const message = `Export backup to ${(defaultStorageLocation) ? defaultStorageLocation.split('_')[0] : 'local'} ` + - `storage ${(defaultStorageCloudId) ? '№' + defaultStorageCloudId : ''}`; + `storage ${(defaultStorageCloudId) ? `№${defaultStorageCloudId}` : ''}`; setHelpMessage(message); }, [defaultStorageLocation, defaultStorageCloudId]); From 7a0d4d0ffe1fcbd9eba05df41ae36e243df3447a Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 00:33:54 +0200 Subject: [PATCH 48/60] eslint --- cvat-ui/src/actions/export-actions.ts | 2 +- cvat-ui/src/reducers/notifications-reducer.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts index 357028f8796..fe38dc73913 100644 --- a/cvat-ui/src/actions/export-actions.ts +++ b/cvat-ui/src/actions/export-actions.ts @@ -110,7 +110,7 @@ export const exportBackupAsync = ( instance: any, targetStorage: Storage, useDefaultSetting: boolean, - fileName?: string + fileName?: string, ): ThunkAction => async (dispatch) => { dispatch(exportActions.exportBackup(instance)); const instanceType = (instance instanceof core.classes.Project) ? 'project' : 'task'; diff --git a/cvat-ui/src/reducers/notifications-reducer.ts b/cvat-ui/src/reducers/notifications-reducer.ts index 4abcf686512..0bb87a83b49 100644 --- a/cvat-ui/src/reducers/notifications-reducer.ts +++ b/cvat-ui/src/reducers/notifications-reducer.ts @@ -382,7 +382,9 @@ export default function (state = defaultState, action: AnyAction): Notifications }; } case ExportActionTypes.EXPORT_DATASET_SUCCESS: { - const { instance, instanceType, isLocal, resource } = action.payload; + const { + instance, instanceType, isLocal, resource, + } = action.payload; const auxiliaryVerb = resource === 'Dataset' ? 'has' : 'have'; return { ...state, From 4a0d2e7866fc938a34c17f8d7ed6b734646a3889 Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 12:40:28 +0200 Subject: [PATCH 49/60] eslint --- cvat-ui/src/actions/import-actions.ts | 4 +++- ...functionality_dump_upload_annotation_point_cloud_format.js | 1 + ...tionality_dump_upload_annotation_velodyne_points_format.js | 1 + .../case_93_canvas3d_functionality_export_dataset.js | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cvat-ui/src/actions/import-actions.ts b/cvat-ui/src/actions/import-actions.ts index 4f9ffc399e6..6372850b31a 100644 --- a/cvat-ui/src/actions/import-actions.ts +++ b/cvat-ui/src/actions/import-actions.ts @@ -85,7 +85,9 @@ export const importDatasetAsync = ( await instance.annotations .importDataset(format, useDefaultSettings, sourceStorage, file, (message: string, progress: number) => ( - dispatch(importActions.importDatasetUpdateStatus(instance, Math.floor(progress * 100), message)) + dispatch(importActions.importDatasetUpdateStatus( + instance, Math.floor(progress * 100), message, + )) )); } else if (instance instanceof core.classes.Task) { if (state.import.tasks.dataset.current?.[instance.id]) { diff --git a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js index 654fe79d63a..5e70853f518 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_91_canvas3d_functionality_dump_upload_annotation_point_cloud_format.js @@ -37,6 +37,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format', before(() => { cy.openTask(taskName); cy.openJob(); + // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(1000); // Waiting for the point cloud to display cy.create3DCuboid(cuboidCreationParams); cy.saveJob('PATCH', 200, 'saveJob'); diff --git a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js index 73b41a6ae89..0d6780dccc9 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js +++ b/tests/cypress/integration/canvas3d_functionality/case_92_canvas3d_functionality_dump_upload_annotation_velodyne_points_format.js @@ -37,6 +37,7 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form before(() => { cy.openTask(taskName); cy.openJob(); + // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(1000); // Waiting for the point cloud to display cy.create3DCuboid(cuboidCreationParams); cy.saveJob('PATCH', 200, 'saveJob'); diff --git a/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js b/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js index c44a710bfa5..a70f81722df 100644 --- a/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js +++ b/tests/cypress/integration/canvas3d_functionality/case_93_canvas3d_functionality_export_dataset.js @@ -18,6 +18,7 @@ context('Canvas 3D functionality. Export as a dataset.', () => { before(() => { cy.openTask(taskName); cy.openJob(); + // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(1000); // Waiting for the point cloud to display cy.create3DCuboid(cuboidCreationParams); cy.saveJob(); From 7d444def4aaa027b004af0be4fa568b87e1867a2 Mon Sep 17 00:00:00 2001 From: Maya Date: Tue, 6 Sep 2022 22:57:42 +0200 Subject: [PATCH 50/60] Create & delete cloud storage --- .github/workflows/full.yml | 1 + .github/workflows/main.yml | 1 + .github/workflows/schedule.yml | 1 + .../cloud-storage-form.tsx | 18 +++- .../en/docs/contributing/running-tests.md | 1 + .../case_113_cloud_storage_import_export.js | 84 +++++++++++++++++++ tests/cypress/support/commands.js | 20 +++++ .../shared => }/docker-compose.minio.yml | 0 tests/python/shared/fixtures/init.py | 2 +- 9 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js rename tests/{python/shared => }/docker-compose.minio.yml (100%) diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index 349a27ae98f..6a7facdb6d2 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -304,6 +304,7 @@ jobs: -f docker-compose.yml \ -f docker-compose.dev.yml \ -f components/serverless/docker-compose.serverless.yml \ + -f tests/docker-compose.minio.yml \ -f tests/docker-compose.file_share.yml up -d - name: Waiting for server diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 358b7ef4078..9243bb4b97a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -264,6 +264,7 @@ jobs: -f docker-compose.yml \ -f docker-compose.dev.yml \ -f components/serverless/docker-compose.serverless.yml \ + -f tests/docker-compose.minio.yml \ -f tests/docker-compose.file_share.yml up -d - name: Waiting for server diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index ef521a7914b..e35de50da4f 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -319,6 +319,7 @@ jobs: -f docker-compose.yml \ -f docker-compose.dev.yml \ -f tests/docker-compose.file_share.yml \ + -f tests/docker-compose.minio.yml \ -f components/serverless/docker-compose.serverless.yml up -d - name: Waiting for server diff --git a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx index 32e1ef82b12..63340c848cd 100644 --- a/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx +++ b/cvat-ui/src/components/create-cloud-storage-page/cloud-storage-form.tsx @@ -203,9 +203,8 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element { } }, []); - const onSubmit = async (): Promise => { + const handleOnFinish = (formValues: CloudStorageForm): void => { let cloudStorageData: Record = {}; - const formValues = await form.validateFields(); cloudStorageData = { ...formValues }; // specific attributes const specificAttributes = new URLSearchParams(); @@ -269,6 +268,12 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element { } }; + const handleOnFinishFailed = ( + { values, errorFields, outOfDate }: { values: CloudStorageForm, errorFields: any[], outOfDate: boolean }, + ): void => { + console.log(values, errorFields, outOfDate); + }; + const resetCredentialsValues = (): void => { form.setFieldsValue({ key: undefined, @@ -607,7 +612,13 @@ export default function CreateCloudStorageForm(props: Props): JSX.Element { }; return ( -
    + handleOnFinish(values)} + onFinishFailed={(values: any): void => handleOnFinishFailed(values)} + > + +context('Cloud storage.', () => { + const caseId = '113'; + + const cloudStorageData = { + displayName: 'Demo bucket', + resource: 'public', + manifest: 'manifest.jsonl', + endpointUrl: 'http://localhost:9000', // for running in docker: http://minio:9000 + }; + + let createdCloudStorageId; + + function attachS3Bucket(data) { + cy.contains('.cvat-header-button', 'Cloud Storages').should('be.visible').click(); + cy.get('.cvat-attach-cloud-storage-button').should('be.visible').click(); + cy.get('#display_name') + .type(data.displayName) + .should('have.attr', 'value', data.displayName); + cy.get('#provider_type').click(); + cy.contains('.cvat-cloud-storage-select-provider', 'AWS').click(); + cy.get('#resource') + .should('exist') + .type(data.resource) + .should('have.attr', 'value', data.resource); + cy.get('#credentials_type').should('exist').click(); + cy.get('.ant-select-dropdown') + .not('.ant-select-dropdown-hidden') + .get('[title="Anonymous access"]') + .should('be.visible') + .click(); + cy.get('#endpoint_url') + .type(data.endpointUrl) + .should('have.attr', 'value', data.endpointUrl); + + cy.get('.cvat-add-manifest-button').should('be.visible').click(); + cy.get('[placeholder="manifest.jsonl"]') + .should('exist') + .should('have.attr', 'value', '') + .type(data.manifest) + .should('have.attr', 'value', data.manifest); + cy.intercept('POST', /\/api\/cloudstorages.*/).as('createCloudStorage'); + cy.get('.cvat-cloud-storage-form').within(() => { + cy.contains('button', 'Submit').click(); + }); + cy.wait('@createCloudStorage').then((interseption) => { + console.log(interseption); + expect(interseption.response.statusCode).to.be.equal(201); + // expect(interseption.response.body.id).to.exist(); + createdCloudStorageId = interseption.response.body.id; + }); + } + + afterEach(() => { + cy.visit('auth/login'); + cy.login(); + attachS3Bucket(cloudStorageData); + }); + + afterEach(() => { + cy.goToCloudStoragesPage(); + cy.deleteCloudStorage(createdCloudStorageId, cloudStorageData.displayName); + cy.logout(); + }); + + describe(`Testing case "${caseId}"`, () => { + it('', () => { + + }); + // test cases: + // 1. create a project with source & target storages, + // create a task in a project with default source & target storages + // export annotations, dataset, task backup, project backup to "public" bucket, + // import annotations, dataset, restore task & project backups from "public" bucket + // 2. create a project with source & target storages, + // create a task in a project with another source & target storages, do all previous actions + // 3. do all previous actions with specifying source & target storages via query params + }); +}); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index bba80ebaf40..f815a5ab499 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -951,6 +951,26 @@ Cypress.Commands.add('verifyNotification', () => { cy.closeNotification('.ant-notification-notice-info'); }); +Cypress.Commands.add('goToCloudStoragesPage', () => { + cy.get('a[value="cloudstorages"]').click(); + cy.url().should('include', '/cloudstorages'); +}); + +Cypress.Commands.add('deleteCloudStorage', (id, displayName) => { + cy.get('.cvat-cloud-storage-item-menu-button').trigger('mousemove').trigger('mouseover'); + cy.get('.ant-dropdown') + .not('.ant-dropdown-hidden') + .within(() => { + cy.contains('[role="menuitem"]', 'Delete').click(); + }); + cy.get('.cvat-delete-cloud-storage-modal') + .should('contain', `You are going to remove the cloudstorage "${displayName}"`) + .within(() => { + cy.contains('button', 'Delete').click(); + }); + // cy.get('.cvat-cloud-storage-item-menu-button')..should('be.hidden'); +}); + Cypress.Commands.overwrite('visit', (orig, url, options) => { orig(url, options); cy.closeModalUnsupportedPlatform(); diff --git a/tests/python/shared/docker-compose.minio.yml b/tests/docker-compose.minio.yml similarity index 100% rename from tests/python/shared/docker-compose.minio.yml rename to tests/docker-compose.minio.yml diff --git a/tests/python/shared/fixtures/init.py b/tests/python/shared/fixtures/init.py index ffed4f695d9..4fc1bff59fd 100644 --- a/tests/python/shared/fixtures/init.py +++ b/tests/python/shared/fixtures/init.py @@ -27,7 +27,7 @@ DC_FILES = [ osp.join(CVAT_ROOT_DIR, dc_file) - for dc_file in ("docker-compose.dev.yml", "tests/python/shared/docker-compose.minio.yml") + for dc_file in ("docker-compose.dev.yml", "tests/docker-compose.minio.yml") ] + CONTAINER_NAME_FILES From e885c43f23fccf4e1669e89d28fcea48c879b3ed Mon Sep 17 00:00:00 2001 From: Maya Date: Mon, 12 Sep 2022 18:39:31 +0200 Subject: [PATCH 51/60] Common part && export job annotations --- .../select-cloud-storage.tsx | 1 + .../src/components/storage/storage-field.tsx | 18 ++- .../case_113_cloud_storage_import_export.js | 143 +++++++++++++++++- tests/cypress/support/commands.js | 38 ++++- tests/cypress/support/commands_projects.js | 17 ++- 5 files changed, 206 insertions(+), 11 deletions(-) diff --git a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx index e4a220a05c6..0812fecfae4 100644 --- a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx +++ b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx @@ -127,6 +127,7 @@ function SelectCloudStorage(props: Props): JSX.Element { setSearchPhrase(selectedCloudStorage?.displayName || ''); }} allowClear + className={`cvat-search${!name ? '-' : `-${name[0]}-`}cloud-storage-field`} > diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index c9ebf2a0a1d..44617c526f3 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -65,6 +65,7 @@ export default function StorageField(props: Props): JSX.Element { <> {locationValue === StorageLocation.CLOUD_STORAGE && renderCloudStorage()} diff --git a/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js b/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js index e70a7819aa9..642dc7ece42 100644 --- a/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js +++ b/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js @@ -5,16 +5,94 @@ /// context('Cloud storage.', () => { + let taskId; + let taskBackupArchiveFullName; + let ctmBeforeExport; + let archiveWithAnnotations; + let createdCloudStorageId; + const caseId = '113'; + const taskName = `Case ${caseId}`; + const labelName = 'car'; + const attrName = 'color'; + const textDefaultValue = 'red'; + const imagesCount = 1; + const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; + const width = 800; + const height = 800; + const posX = 10; + const posY = 10; + const color = 'gray'; + const archiveName = `${imageFileName}.zip`; + const archivePath = `cypress/fixtures/${archiveName}`; + const imagesFolder = `cypress/fixtures/${imageFileName}`; + const directoryToArchive = imagesFolder; + const format = 'CVAT for images'; + + const createRectangleShape2Points = { + points: 'By 2 Points', + type: 'Shape', + labelName, + firstX: 250, + firstY: 350, + secondX: 350, + secondY: 450, + }; + + const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + const cloudStorageData = { displayName: 'Demo bucket', resource: 'public', manifest: 'manifest.jsonl', - endpointUrl: 'http://localhost:9000', // for running in docker: http://minio:9000 + endpointUrl: `http://${serverHost}:9000`, }; - let createdCloudStorageId; + const storageConnectedToCloud = { + location: 'Cloud storage', + cloudStorageId: undefined, + }; + + const defaultProject = { + name: `Case ${caseId}`, + label: labelName, + attrName: 'color', + attrVaue: 'red', + multiAttrParams: false, + }; + + const firstProject = { + ...defaultProject, + name: `${defaultProject.name}_1`, + advancedConfiguration: { + sourceStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + targetStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + }, + }; + + const secondProject = { + ...defaultProject, + name: `${defaultProject}_2`, + }; + + const firstTask = { + name: taskName, + label: labelName, + attrName, + textDefaultValue, + archiveName, + multiAttrParams: false, + forProject: true, + attachToProject: true, + projectName: firstProject.name, + }; function attachS3Bucket(data) { cy.contains('.cvat-header-button', 'Cloud Storages').should('be.visible').click(); @@ -51,27 +129,78 @@ context('Cloud storage.', () => { cy.wait('@createCloudStorage').then((interseption) => { console.log(interseption); expect(interseption.response.statusCode).to.be.equal(201); - // expect(interseption.response.body.id).to.exist(); createdCloudStorageId = interseption.response.body.id; }); + cy.verifyNotification(); } - afterEach(() => { + before(() => { cy.visit('auth/login'); cy.login(); attachS3Bucket(cloudStorageData); + cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); + cy.createZipArchive(directoryToArchive, archivePath); }); - afterEach(() => { + after(() => { cy.goToCloudStoragesPage(); - cy.deleteCloudStorage(createdCloudStorageId, cloudStorageData.displayName); + cy.deleteCloudStorage(cloudStorageData.displayName); cy.logout(); }); describe(`Testing case "${caseId}"`, () => { - it('', () => { + it('Use project source & target storage for exporting/importing job annotations', () => { + cy.goToProjectsList(); + + firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + cy.createProjects( + firstProject.name, + firstProject.label, + firstProject.attrName, + firstProject.attrVaue, + firstProject.multiAttrParams, + firstProject.advancedConfiguration, + ); + cy.goToTaskList(); + cy.createAnnotationTask( + firstTask.name, + firstTask.label, + firstTask.attrName, + firstTask.textDefaultValue, + archiveName, + firstTask.multiAttrParams, + null, + firstTask.forProject, + firstTask.attachToProject, + firstTask.projectName, + + ); + cy.goToTaskList(); + cy.openTask(firstTask.name); + cy.url().then((link) => { + taskId = Number(link.split('/').slice(-1)[0]); + }); + cy.openJob(); + cy.createRectangle(createRectangleShape2Points).then(() => { + Cypress.config('scrollBehavior', false); + }); + cy.document().then((doc) => { + ctmBeforeExport = doc.getElementById('cvat_canvas_shape_1').getCTM(); + }); + cy.saveJob('PATCH', 200, 'saveJobDump'); + const exportParams = { + type: 'annotations', + format, + archiveName: 'job_annotations', + }; + cy.exportJob(exportParams); + cy.waitForFileUploadToCloudStorage(); + cy.goToTaskList(); + cy.deleteTask(firstTask.name); }); + // test cases: // 1. create a project with source & target storages, // create a task in a project with default source & target storages diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index f815a5ab499..936bbd1823e 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -645,6 +645,29 @@ Cypress.Commands.add('advancedConfiguration', (advancedConfigurationParams) => { if (advancedConfigurationParams.overlapSize) { cy.get('#overlapSize').type(advancedConfigurationParams.overlapSize); } + if (advancedConfigurationParams.sourceStorage) { + const { sourceStorage, targetStorage } = advancedConfigurationParams; + + cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location).should('be.visible').click(); + + if (sourceStorage.cloudStorageId) { + cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').click(); + } + + cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-targetStorage-location', targetStorage.location).should('be.visible').click(); + + if (targetStorage.cloudStorageId) { + cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').last().click(); + } + } }); Cypress.Commands.add('removeAnnotations', () => { @@ -876,6 +899,7 @@ Cypress.Commands.add('exportTask', ({ Cypress.Commands.add('exportJob', ({ type, format, archiveCustomeName, + useDefaultLocation = true, location = 'Local', cloudStorageId = null, }) => { cy.interactMenu('Export job dataset'); cy.get('.cvat-modal-export-job').should('be.visible').find('.cvat-modal-export-select').click(); @@ -887,6 +911,18 @@ Cypress.Commands.add('exportJob', ({ if (archiveCustomeName) { cy.get('.cvat-modal-export-job').find('.cvat-modal-export-filename-input').type(archiveCustomeName); } + if (!useDefaultLocation) { + cy.get('.cvat-modal-export-job').find('.cvat-settings-switch').should('be.checked').click(); + cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-targetStorage-location', location).should('be.visible').click(); + + if (cloudStorageId) { + cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').click(); + } + } cy.contains('button', 'OK').click(); cy.get('.cvat-notification-notice-export-job-start').should('be.visible'); cy.closeNotification('.cvat-notification-notice-export-job-start'); @@ -956,7 +992,7 @@ Cypress.Commands.add('goToCloudStoragesPage', () => { cy.url().should('include', '/cloudstorages'); }); -Cypress.Commands.add('deleteCloudStorage', (id, displayName) => { +Cypress.Commands.add('deleteCloudStorage', (displayName) => { cy.get('.cvat-cloud-storage-item-menu-button').trigger('mousemove').trigger('mouseover'); cy.get('.ant-dropdown') .not('.ant-dropdown-hidden') diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 21efb8b4f14..705ab273eb0 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -12,7 +12,11 @@ Cypress.Commands.add('goToProjectsList', () => { Cypress.Commands.add( 'createProjects', - (projectName, labelName, attrName, textDefaultValue, multiAttrParams, expectedResult = 'success') => { + ( + projectName, labelName, attrName, textDefaultValue, + multiAttrParams, advancedConfigurationParams, + expectedResult = 'success', + ) => { cy.get('.cvat-create-project-dropdown').click(); cy.get('.cvat-create-project-button').click(); cy.get('#name').type(projectName); @@ -26,6 +30,9 @@ Cypress.Commands.add( if (multiAttrParams) { cy.updateAttributes(multiAttrParams); } + if (advancedConfigurationParams) { + cy.advancedConfiguration(advancedConfigurationParams); + } cy.contains('button', 'Continue').click(); cy.get('.cvat-create-project-content').within(() => { cy.contains('button', 'Submit & Continue').click(); @@ -179,6 +186,14 @@ Cypress.Commands.add('getDownloadFileName', () => { }); }); +Cypress.Commands.add('waitForFileUploadToCloudStorage', () => { + cy.intercept('GET', '**=download').as('download'); + cy.wait('@download', { requestTimeout: 7000 }).then((interseption) => { + expect(interseption.response.statusCode).to.be.equal(200); + }); + cy.verifyNotification(); +}); + Cypress.Commands.add('waitForDownload', () => { cy.getDownloadFileName().then((filename) => { cy.verifyDownload(filename); From 46ca0bee09072dee7df9c3713bc1b2631f0d98c6 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 00:12:43 +0200 Subject: [PATCH 52/60] Update tests && add tests for project backup --- ...kup_restore_project_to_various_storages.js | 165 ++++++++++++++ .../case_113_cloud_storage_import_export.js | 213 ------------------ ...t_storage_for_import_export_annotations.js | 185 +++++++++++++++ ...k_storage_for_import_export_annotations.js | 194 ++++++++++++++++ ...m_storage_for_import_export_annotations.js | 155 +++++++++++++ tests/cypress/support/commands.js | 73 +++++- .../support/commands_cloud_storages.js | 47 ++++ tests/cypress/support/commands_projects.js | 74 ++++-- tests/cypress/support/index.js | 2 + 9 files changed, 875 insertions(+), 233 deletions(-) create mode 100644 tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js delete mode 100644 tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js create mode 100644 tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js create mode 100644 tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js create mode 100644 tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js create mode 100644 tests/cypress/support/commands_cloud_storages.js diff --git a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js new file mode 100644 index 00000000000..3ee85514c20 --- /dev/null +++ b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js @@ -0,0 +1,165 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +/// + +context('Tests source & target storage for backups.', () => { + const backupArchiveName = 'task_backup'; + let projectID = ''; + let createdCloudStorageId; + const caseId = '117'; + const taskName = `Case ${caseId}`; + const labelName = 'car'; + const attrName = 'color'; + const textDefaultValue = 'red'; + const imagesCount = 1; + const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; + const width = 800; + const height = 800; + const posX = 10; + const posY = 10; + const color = 'gray'; + const dataArchiveName = `${imageFileName}.zip`; + const archivePath = `cypress/fixtures/${dataArchiveName}`; + const imagesFolder = `cypress/fixtures/${imageFileName}`; + const directoryToArchive = imagesFolder; + + const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + + const cloudStorageData = { + displayName: 'Demo bucket', + resource: 'public', + manifest: 'manifest.jsonl', + endpointUrl: `http://${serverHost}:9000`, + }; + + const storageConnectedToCloud = { + location: 'Cloud storage', + cloudStorageId: undefined, + }; + + const project = { + name: `Case ${caseId}`, + label: labelName, + attrName: 'color', + attrVaue: 'red', + multiAttrParams: false, + advancedConfiguration: { + sourceStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + targetStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + }, + }; + + const task = { + name: taskName, + label: labelName, + attrName, + textDefaultValue, + dataArchiveName, + multiAttrParams: false, + forProject: true, + attachToProject: true, + projectName: project.name, + advancedConfiguration: { + sourceStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + targetStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + }, + }; + + function getProjectID() { + cy.url().then((url) => { + projectID = Number(url.split('/').slice(-1)[0].split('?')[0]); + }); + } + + before(() => { + cy.visit('auth/login'); + cy.login(); + createdCloudStorageId = cy.attachS3Bucket(cloudStorageData); + cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); + cy.createZipArchive(directoryToArchive, archivePath); + cy.goToProjectsList(); + project.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + project.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + + cy.createProjects( + project.name, + project.label, + project.attrName, + project.attrVaue, + project.multiAttrParams, + project.advancedConfiguration, + ); + + cy.goToTaskList(); + cy.createAnnotationTask( + task.name, + task.label, + task.attrName, + task.textDefaultValue, + dataArchiveName, + task.multiAttrParams, + null, + task.forProject, + task.attachToProject, + task.projectName, + ); + cy.openProject(project.name); + getProjectID(); + }); + + after(() => { + cy.goToCloudStoragesPage(); + cy.deleteCloudStorage(cloudStorageData.displayName); + cy.logout(); + cy.getAuthKey().then((authKey) => { + cy.deleteProjects(authKey, [project.name]); + }); + }); + + describe(`Testing case "${caseId}"`, () => { + it('Export project to custom local storage', () => { + cy.goToProjectsList(); + cy.backupProject( + project.name, + backupArchiveName, + { location: 'Local' }, + false, + ); + cy.waitForDownload(); + }); + + it('Export project to default minio bucket', () => { + cy.goToProjectsList(); + cy.backupProject( + project.name, + backupArchiveName, + project.advancedConfiguration.targetStorage, + ); + cy.waitForFileUploadToCloudStorage(); + cy.deleteProject(project.name, projectID); + }); + + it('Import project from minio bucket', () => { + cy.restoreProject( + `${backupArchiveName}.zip`, + project.advancedConfiguration.sourceStorage, + ); + }); + }); +}); diff --git a/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js b/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js deleted file mode 100644 index 642dc7ece42..00000000000 --- a/tests/cypress/integration/actions_tasks3/case_113_cloud_storage_import_export.js +++ /dev/null @@ -1,213 +0,0 @@ -// Copyright (C) 2021-2022 Intel Corporation -// -// SPDX-License-Identifier: MIT - -/// - -context('Cloud storage.', () => { - let taskId; - let taskBackupArchiveFullName; - let ctmBeforeExport; - let archiveWithAnnotations; - let createdCloudStorageId; - - const caseId = '113'; - - const taskName = `Case ${caseId}`; - const labelName = 'car'; - const attrName = 'color'; - const textDefaultValue = 'red'; - const imagesCount = 1; - const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; - const width = 800; - const height = 800; - const posX = 10; - const posY = 10; - const color = 'gray'; - const archiveName = `${imageFileName}.zip`; - const archivePath = `cypress/fixtures/${archiveName}`; - const imagesFolder = `cypress/fixtures/${imageFileName}`; - const directoryToArchive = imagesFolder; - const format = 'CVAT for images'; - - const createRectangleShape2Points = { - points: 'By 2 Points', - type: 'Shape', - labelName, - firstX: 250, - firstY: 350, - secondX: 350, - secondY: 450, - }; - - const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; - - const cloudStorageData = { - displayName: 'Demo bucket', - resource: 'public', - manifest: 'manifest.jsonl', - endpointUrl: `http://${serverHost}:9000`, - }; - - const storageConnectedToCloud = { - location: 'Cloud storage', - cloudStorageId: undefined, - }; - - const defaultProject = { - name: `Case ${caseId}`, - label: labelName, - attrName: 'color', - attrVaue: 'red', - multiAttrParams: false, - }; - - const firstProject = { - ...defaultProject, - name: `${defaultProject.name}_1`, - advancedConfiguration: { - sourceStorage: { - ...storageConnectedToCloud, - displayName: cloudStorageData.displayName, - }, - targetStorage: { - ...storageConnectedToCloud, - displayName: cloudStorageData.displayName, - }, - }, - }; - - const secondProject = { - ...defaultProject, - name: `${defaultProject}_2`, - }; - - const firstTask = { - name: taskName, - label: labelName, - attrName, - textDefaultValue, - archiveName, - multiAttrParams: false, - forProject: true, - attachToProject: true, - projectName: firstProject.name, - }; - - function attachS3Bucket(data) { - cy.contains('.cvat-header-button', 'Cloud Storages').should('be.visible').click(); - cy.get('.cvat-attach-cloud-storage-button').should('be.visible').click(); - cy.get('#display_name') - .type(data.displayName) - .should('have.attr', 'value', data.displayName); - cy.get('#provider_type').click(); - cy.contains('.cvat-cloud-storage-select-provider', 'AWS').click(); - cy.get('#resource') - .should('exist') - .type(data.resource) - .should('have.attr', 'value', data.resource); - cy.get('#credentials_type').should('exist').click(); - cy.get('.ant-select-dropdown') - .not('.ant-select-dropdown-hidden') - .get('[title="Anonymous access"]') - .should('be.visible') - .click(); - cy.get('#endpoint_url') - .type(data.endpointUrl) - .should('have.attr', 'value', data.endpointUrl); - - cy.get('.cvat-add-manifest-button').should('be.visible').click(); - cy.get('[placeholder="manifest.jsonl"]') - .should('exist') - .should('have.attr', 'value', '') - .type(data.manifest) - .should('have.attr', 'value', data.manifest); - cy.intercept('POST', /\/api\/cloudstorages.*/).as('createCloudStorage'); - cy.get('.cvat-cloud-storage-form').within(() => { - cy.contains('button', 'Submit').click(); - }); - cy.wait('@createCloudStorage').then((interseption) => { - console.log(interseption); - expect(interseption.response.statusCode).to.be.equal(201); - createdCloudStorageId = interseption.response.body.id; - }); - cy.verifyNotification(); - } - - before(() => { - cy.visit('auth/login'); - cy.login(); - attachS3Bucket(cloudStorageData); - cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); - cy.createZipArchive(directoryToArchive, archivePath); - }); - - after(() => { - cy.goToCloudStoragesPage(); - cy.deleteCloudStorage(cloudStorageData.displayName); - cy.logout(); - }); - - describe(`Testing case "${caseId}"`, () => { - it('Use project source & target storage for exporting/importing job annotations', () => { - cy.goToProjectsList(); - - firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; - firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; - - cy.createProjects( - firstProject.name, - firstProject.label, - firstProject.attrName, - firstProject.attrVaue, - firstProject.multiAttrParams, - firstProject.advancedConfiguration, - ); - cy.goToTaskList(); - cy.createAnnotationTask( - firstTask.name, - firstTask.label, - firstTask.attrName, - firstTask.textDefaultValue, - archiveName, - firstTask.multiAttrParams, - null, - firstTask.forProject, - firstTask.attachToProject, - firstTask.projectName, - - ); - cy.goToTaskList(); - cy.openTask(firstTask.name); - cy.url().then((link) => { - taskId = Number(link.split('/').slice(-1)[0]); - }); - cy.openJob(); - cy.createRectangle(createRectangleShape2Points).then(() => { - Cypress.config('scrollBehavior', false); - }); - cy.document().then((doc) => { - ctmBeforeExport = doc.getElementById('cvat_canvas_shape_1').getCTM(); - }); - cy.saveJob('PATCH', 200, 'saveJobDump'); - const exportParams = { - type: 'annotations', - format, - archiveName: 'job_annotations', - }; - cy.exportJob(exportParams); - cy.waitForFileUploadToCloudStorage(); - cy.goToTaskList(); - cy.deleteTask(firstTask.name); - }); - - // test cases: - // 1. create a project with source & target storages, - // create a task in a project with default source & target storages - // export annotations, dataset, task backup, project backup to "public" bucket, - // import annotations, dataset, restore task & project backups from "public" bucket - // 2. create a project with source & target storages, - // create a task in a project with another source & target storages, do all previous actions - // 3. do all previous actions with specifying source & target storages via query params - }); -}); diff --git a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js new file mode 100644 index 00000000000..a729e25dd5d --- /dev/null +++ b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js @@ -0,0 +1,185 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +/// + +context('Tests for source and target storage.', () => { + let createdCloudStorageId; + + const caseId = '113'; + + const taskName = `Case ${caseId}`; + const labelName = 'car'; + const attrName = 'color'; + const textDefaultValue = 'red'; + const imagesCount = 1; + const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; + const width = 800; + const height = 800; + const posX = 10; + const posY = 10; + const color = 'gray'; + const dataArchiveName = `${imageFileName}.zip`; + const archivePath = `cypress/fixtures/${dataArchiveName}`; + const imagesFolder = `cypress/fixtures/${imageFileName}`; + const directoryToArchive = imagesFolder; + const format = 'CVAT for images'; + + const createRectangleShape2Points = { + points: 'By 2 Points', + type: 'Shape', + labelName, + firstX: 250, + firstY: 350, + secondX: 350, + secondY: 450, + }; + + const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + + const cloudStorageData = { + displayName: 'Demo bucket', + resource: 'public', + manifest: 'manifest.jsonl', + endpointUrl: `http://${serverHost}:9000`, + }; + + const storageConnectedToCloud = { + location: 'Cloud storage', + cloudStorageId: undefined, + }; + + const firstProject = { + name: `Case ${caseId}`, + label: labelName, + attrName: 'color', + attrVaue: 'red', + multiAttrParams: false, + advancedConfiguration: { + sourceStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + targetStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + }, + }; + + const firstTask = { + name: taskName, + label: labelName, + attrName, + textDefaultValue, + dataArchiveName, + multiAttrParams: false, + forProject: true, + attachToProject: true, + projectName: firstProject.name, + advancedConfiguration: { + sourceStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + targetStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + }, + }; + + before(() => { + cy.visit('auth/login'); + cy.login(); + createdCloudStorageId = cy.attachS3Bucket(cloudStorageData); + cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); + cy.createZipArchive(directoryToArchive, archivePath); + cy.goToProjectsList(); + firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + + cy.createProjects( + firstProject.name, + firstProject.label, + firstProject.attrName, + firstProject.attrVaue, + firstProject.multiAttrParams, + firstProject.advancedConfiguration, + ); + }); + + after(() => { + cy.goToCloudStoragesPage(); + cy.deleteCloudStorage(cloudStorageData.displayName); + cy.logout(); + cy.getAuthKey().then((authKey) => { + cy.deleteProjects(authKey, [firstProject.name]); + }); + }); + + describe(`Testing case "${caseId}"`, () => { + it('Export job annotations to default minio bucket that was attached to the project.', () => { + // create an annotation task with default project source and target storages + cy.goToTaskList(); + cy.createAnnotationTask( + firstTask.name, + firstTask.label, + firstTask.attrName, + firstTask.textDefaultValue, + dataArchiveName, + firstTask.multiAttrParams, + null, + firstTask.forProject, + firstTask.attachToProject, + firstTask.projectName, + ); + cy.goToTaskList(); + cy.openTask(firstTask.name); + + // create dummy annotations and export them to "public" minio bucket + cy.openJob(); + cy.createRectangle(createRectangleShape2Points).then(() => { + Cypress.config('scrollBehavior', false); + }); + cy.saveJob('PATCH', 200, 'saveJobDump'); + const exportParams = { + type: 'annotations', + format, + archiveCustomeName: 'job_annotations', + targetStorage: firstProject.advancedConfiguration.targetStorage, + }; + cy.exportJob(exportParams); + cy.waitForFileUploadToCloudStorage(); + + // remove annotations + cy.removeAnnotations(); + cy.saveJob('PUT'); + cy.get('#cvat_canvas_shape_1').should('not.exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('not.exist'); + }); + + it('Import job annotations from default minio bucket that was attached to the project.', () => { + // upload annotations from "public" minio bucket + cy.interactMenu('Upload annotations'); + cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); + + cy.uploadAnnotations( + format.split(' ')[0], + 'job_annotations.zip', + '.cvat-modal-content-load-job-annotation', + firstProject.advancedConfiguration.sourceStorage, + ); + + cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); + cy.get('#cvat_canvas_shape_1').should('exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); + + cy.goToTaskList(); + cy.deleteTask(firstTask.name); + }); + }); +}); diff --git a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js new file mode 100644 index 00000000000..3e10a4dd482 --- /dev/null +++ b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js @@ -0,0 +1,194 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +/// + +context('Tests for source and target storage.', () => { + let annotationsArchiveName = ''; + let createdCloudStorageId; + + const caseId = '114'; + + const taskName = `Case ${caseId}`; + const labelName = 'car'; + const attrName = 'color'; + const textDefaultValue = 'red'; + const imagesCount = 1; + const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; + const width = 800; + const height = 800; + const posX = 10; + const posY = 10; + const color = 'gray'; + const dataArchiveName = `${imageFileName}.zip`; + const archivePath = `cypress/fixtures/${dataArchiveName}`; + const imagesFolder = `cypress/fixtures/${imageFileName}`; + const directoryToArchive = imagesFolder; + const format = 'CVAT for images'; + + const createRectangleShape2Points = { + points: 'By 2 Points', + type: 'Shape', + labelName, + firstX: 250, + firstY: 350, + secondX: 350, + secondY: 450, + }; + + const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + + const cloudStorageData = { + displayName: 'Demo bucket', + resource: 'public', + manifest: 'manifest.jsonl', + endpointUrl: `http://${serverHost}:9000`, + }; + + const storageConnectedToCloud = { + location: 'Cloud storage', + cloudStorageId: undefined, + }; + + const firstProject = { + name: `Case ${caseId}`, + label: labelName, + attrName: 'color', + attrVaue: 'red', + multiAttrParams: false, + advancedConfiguration: { + sourceStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + targetStorage: { + ...storageConnectedToCloud, + displayName: cloudStorageData.displayName, + }, + }, + }; + + const firstTask = { + name: taskName, + label: labelName, + attrName, + textDefaultValue, + dataArchiveName, + multiAttrParams: false, + forProject: true, + attachToProject: true, + projectName: firstProject.name, + advancedConfiguration: { + sourceStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + targetStorage: { + disableSwitch: true, + location: 'Local', + cloudStorageId: null, + }, + }, + }; + + before(() => { + cy.visit('auth/login'); + cy.login(); + createdCloudStorageId = cy.attachS3Bucket(cloudStorageData); + cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); + cy.createZipArchive(directoryToArchive, archivePath); + cy.goToProjectsList(); + firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + + cy.createProjects( + firstProject.name, + firstProject.label, + firstProject.attrName, + firstProject.attrVaue, + firstProject.multiAttrParams, + firstProject.advancedConfiguration, + ); + }); + + after(() => { + cy.goToCloudStoragesPage(); + cy.deleteCloudStorage(cloudStorageData.displayName); + cy.logout(); + cy.getAuthKey().then((authKey) => { + cy.deleteProjects(authKey, [firstProject.name]); + }); + }); + + describe(`Testing case "${caseId}"`, () => { + it('Export job annotations to default minio bucket that was attached to the task in the project.', () => { + // create an annotation task with custom local source & target storages + cy.goToTaskList(); + cy.createAnnotationTask( + firstTask.name, + firstTask.label, + firstTask.attrName, + firstTask.textDefaultValue, + dataArchiveName, + firstTask.multiAttrParams, + firstTask.advancedConfiguration, + firstTask.forProject, + firstTask.attachToProject, + firstTask.projectName, + ); + cy.goToTaskList(); + cy.openTask(firstTask.name); + + // create dummy annotations and export them to default local storage + cy.openJob(); + cy.createRectangle(createRectangleShape2Points).then(() => { + Cypress.config('scrollBehavior', false); + }); + + cy.saveJob('PATCH', 200, 'saveJobDump'); + const exportParams = { + type: 'annotations', + format, + archiveCustomeName: 'job_annotations', + targetStorage: firstProject.advancedConfiguration.targetStorage, + }; + cy.exportJob(exportParams); + cy.getDownloadFileName().then((file) => { + annotationsArchiveName = file; + cy.verifyDownload(annotationsArchiveName); + }); + cy.verifyNotification(); + + // remove annotations + cy.removeAnnotations(); + cy.saveJob('PUT'); + cy.get('#cvat_canvas_shape_1').should('not.exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('not.exist'); + }); + + it('Import job annotations from default minio bucket that was attached to the task in the project.', () => { + cy.goToTaskList(); + cy.openTask(firstTask.name); + cy.openJob(); + + // upload annotations from default local storage + cy.interactMenu('Upload annotations'); + cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); + cy.uploadAnnotations( + format.split(' ')[0], + annotationsArchiveName, + '.cvat-modal-content-load-job-annotation', + firstTask.advancedConfiguration.sourceStorage, + ); + + cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); + cy.get('#cvat_canvas_shape_1').should('exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); + + cy.goToTaskList(); + cy.deleteTask(firstTask.name); + }); + }); +}); diff --git a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js new file mode 100644 index 00000000000..0247d09bf5e --- /dev/null +++ b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js @@ -0,0 +1,155 @@ +// Copyright (C) 2022 CVAT.ai Corporation +// +// SPDX-License-Identifier: MIT + +/// + +context('Import and export annotations: specify source and target storage in modals.', () => { + let createdCloudStorageId; + const caseId = '115'; + const taskName = `Case ${caseId}`; + const labelName = 'car'; + const attrName = 'color'; + const textDefaultValue = 'red'; + const imagesCount = 1; + const imageFileName = `image_${taskName.replace(/\s+/g, '_').toLowerCase()}`; + const width = 800; + const height = 800; + const posX = 10; + const posY = 10; + const color = 'gray'; + const dataArchiveName = `${imageFileName}.zip`; + const archivePath = `cypress/fixtures/${dataArchiveName}`; + const imagesFolder = `cypress/fixtures/${imageFileName}`; + const directoryToArchive = imagesFolder; + const format = 'CVAT for images'; + + const createRectangleShape2Points = { + points: 'By 2 Points', + type: 'Shape', + labelName, + firstX: 250, + firstY: 350, + secondX: 350, + secondY: 450, + }; + + const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + + const cloudStorageData = { + displayName: 'Demo bucket', + resource: 'public', + manifest: 'manifest.jsonl', + endpointUrl: `http://${serverHost}:9000`, + }; + + const firstProject = { + name: `Case ${caseId}`, + label: labelName, + attrName: 'color', + attrVaue: 'red', + multiAttrParams: false, + }; + + const firstTask = { + name: taskName, + label: labelName, + attrName, + textDefaultValue, + dataArchiveName, + multiAttrParams: false, + forProject: true, + attachToProject: true, + projectName: firstProject.name, + }; + + before(() => { + cy.visit('auth/login'); + cy.login(); + createdCloudStorageId = cy.attachS3Bucket(cloudStorageData); + cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); + cy.createZipArchive(directoryToArchive, archivePath); + cy.goToProjectsList(); + + cy.createProjects( + firstProject.name, + firstProject.label, + firstProject.attrName, + firstProject.attrVaue, + firstProject.multiAttrParams, + ); + }); + + after(() => { + cy.goToCloudStoragesPage(); + cy.deleteCloudStorage(cloudStorageData.displayName); + cy.logout(); + cy.getAuthKey().then((authKey) => { + cy.deleteProjects(authKey, [firstProject.name]); + }); + }); + + describe(`Testing case "${caseId}"`, () => { + it('Export job annotations to custom minio bucket', () => { + // create an annotation task with local source & target storages + cy.goToTaskList(); + cy.createAnnotationTask( + firstTask.name, + firstTask.label, + firstTask.attrName, + firstTask.textDefaultValue, + dataArchiveName, + firstTask.multiAttrParams, + null, + firstTask.forProject, + firstTask.attachToProject, + firstTask.projectName, + ); + cy.goToTaskList(); + cy.openTask(firstTask.name); + cy.openJob(); + + // create dummy annotations and export them to "public" minio bucket + cy.createRectangle(createRectangleShape2Points).then(() => { + Cypress.config('scrollBehavior', false); + }); + cy.saveJob('PATCH', 200, 'saveJobDump'); + const exportParams = { + type: 'annotations', + format, + archiveCustomeName: 'job_annotations', + targetStorage: { + location: 'Cloud storage', + cloudStorageId: createdCloudStorageId, + }, + useDefaultLocation: false, + }; + cy.exportJob(exportParams); + cy.waitForFileUploadToCloudStorage(); + + // remove annotations + cy.removeAnnotations(); + cy.saveJob('PUT'); + cy.get('#cvat_canvas_shape_1').should('not.exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('not.exist'); + }); + + it('Import job annotations from custom minio "public" bucket', () => { + cy.interactMenu('Upload annotations'); + cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); + cy.uploadAnnotations( + format.split(' ')[0], + 'job_annotations.zip', + '.cvat-modal-content-load-job-annotation', + { + location: 'Cloud storage', + cloudStorageId: createdCloudStorageId, + }, + false, + ); + cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); + cy.get('#cvat_canvas_shape_1').should('exist'); + cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); + }); + }); +}); diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 936bbd1823e..ebeb7c2bbd1 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -646,7 +646,11 @@ Cypress.Commands.add('advancedConfiguration', (advancedConfigurationParams) => { cy.get('#overlapSize').type(advancedConfigurationParams.overlapSize); } if (advancedConfigurationParams.sourceStorage) { - const { sourceStorage, targetStorage } = advancedConfigurationParams; + const { sourceStorage } = advancedConfigurationParams; + + if (sourceStorage.disableSwitch) { + cy.get('.ant-collapse-content-box').find('#useProjectSourceStorage').click(); + } cy.get('.cvat-select-sourceStorage-storage').within(() => { cy.get('.ant-select-selection-item').click(); @@ -657,6 +661,14 @@ Cypress.Commands.add('advancedConfiguration', (advancedConfigurationParams) => { cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } + } + + if (advancedConfigurationParams.targetStorage) { + const { targetStorage } = advancedConfigurationParams; + + if (targetStorage.disableSwitch) { + cy.get('.ant-collapse-content-box').find('#useProjectTargetStorage').click(); + } cy.get('.cvat-select-targetStorage-storage').within(() => { cy.get('.ant-select-selection-item').click(); @@ -680,6 +692,57 @@ Cypress.Commands.add('removeAnnotations', () => { }); }); +Cypress.Commands.add('confirmUpdate', (modalWindowClassName) => { + cy.get(modalWindowClassName).should('be.visible').within(() => { + cy.contains('button', 'Update').click(); + }); +}); + +Cypress.Commands.add( + 'uploadAnnotations', ( + format, + file, + confirmModalClassName, + sourceStorage = null, + useDefaultLocation = true, + ) => { + cy.get('.cvat-modal-import-dataset').find('.cvat-modal-import-select').click(); + cy.contains('.cvat-modal-import-dataset-option-item', format).click(); + cy.get('.cvat-modal-import-select').should('contain.text', format); + + if (!useDefaultLocation) { + cy.get('.cvat-modal-import-dataset') + .find('.cvat-modal-import-switch-use-default-storage') + .click(); + cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location) + .should('be.visible') + .click(); + if (sourceStorage.cloudStorageId) { + cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').click(); + } + } + if (sourceStorage && sourceStorage.cloudStorageId) { + cy.get('.cvat-modal-import-dataset') + .find('.cvat-modal-import-filename-input') + .type(file); + } else { + cy.get('input[type="file"]').attachFile(file, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${file}"]`).should('be.visible'); + } + cy.contains('button', 'OK').click(); + cy.confirmUpdate(confirmModalClassName); + cy.get('.cvat-notification-notice-import-annotation-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-import-annotation-start'); + cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); + cy.contains('Annotations have been loaded').should('be.visible'); + cy.closeNotification('.ant-notification-notice-info'); + }, +); + Cypress.Commands.add('goToTaskList', () => { cy.get('a[value="tasks"]').click(); cy.url().should('include', '/tasks'); @@ -899,7 +962,7 @@ Cypress.Commands.add('exportTask', ({ Cypress.Commands.add('exportJob', ({ type, format, archiveCustomeName, - useDefaultLocation = true, location = 'Local', cloudStorageId = null, + targetStorage = null, useDefaultLocation = true, }) => { cy.interactMenu('Export job dataset'); cy.get('.cvat-modal-export-job').should('be.visible').find('.cvat-modal-export-select').click(); @@ -912,13 +975,13 @@ Cypress.Commands.add('exportJob', ({ cy.get('.cvat-modal-export-job').find('.cvat-modal-export-filename-input').type(archiveCustomeName); } if (!useDefaultLocation) { - cy.get('.cvat-modal-export-job').find('.cvat-settings-switch').should('be.checked').click(); + cy.get('.cvat-modal-export-job').find('.cvat-settings-switch').click(); cy.get('.cvat-select-targetStorage-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-targetStorage-location', location).should('be.visible').click(); + cy.contains('.cvat-select-targetStorage-location', targetStorage.location).should('be.visible').click(); - if (cloudStorageId) { + if (targetStorage.cloudStorageId) { cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } diff --git a/tests/cypress/support/commands_cloud_storages.js b/tests/cypress/support/commands_cloud_storages.js new file mode 100644 index 00000000000..53fff37f025 --- /dev/null +++ b/tests/cypress/support/commands_cloud_storages.js @@ -0,0 +1,47 @@ +// Copyright (C) 2022 CVAT.ai Corp +// +// SPDX-License-Identifier: MIT + +/// + +Cypress.Commands.add('attachS3Bucket', (data) => { + let createdCloudStorageId; + cy.contains('.cvat-header-button', 'Cloud Storages').should('be.visible').click(); + cy.get('.cvat-attach-cloud-storage-button').should('be.visible').click(); + cy.get('#display_name') + .type(data.displayName) + .should('have.attr', 'value', data.displayName); + cy.get('#provider_type').click(); + cy.contains('.cvat-cloud-storage-select-provider', 'AWS').click(); + cy.get('#resource') + .should('exist') + .type(data.resource) + .should('have.attr', 'value', data.resource); + cy.get('#credentials_type').should('exist').click(); + cy.get('.ant-select-dropdown') + .not('.ant-select-dropdown-hidden') + .get('[title="Anonymous access"]') + .should('be.visible') + .click(); + cy.get('#endpoint_url') + .type(data.endpointUrl) + .should('have.attr', 'value', data.endpointUrl); + + cy.get('.cvat-add-manifest-button').should('be.visible').click(); + cy.get('[placeholder="manifest.jsonl"]') + .should('exist') + .should('have.attr', 'value', '') + .type(data.manifest) + .should('have.attr', 'value', data.manifest); + cy.intercept('POST', /\/api\/cloudstorages.*/).as('createCloudStorage'); + cy.get('.cvat-cloud-storage-form').within(() => { + cy.contains('button', 'Submit').click(); + }); + cy.wait('@createCloudStorage').then((interseption) => { + console.log(interseption); + expect(interseption.response.statusCode).to.be.equal(201); + createdCloudStorageId = interseption.response.body.id; + }); + cy.verifyNotification(); + return createdCloudStorageId; +}); diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 705ab273eb0..849e9b627bf 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -143,24 +144,67 @@ Cypress.Commands.add('importProject', ({ cy.get('.cvat-modal-import-dataset-status').should('not.exist'); }); -Cypress.Commands.add('backupProject', (projectName, backupFileName) => { - cy.projectActions(projectName); - cy.get('.cvat-project-actions-menu').contains('Backup Project').click(); - cy.get('.cvat-modal-export-project').should('be.visible'); - if (backupFileName) { - cy.get('.cvat-modal-export-project').find('.cvat-modal-export-filename-input').type(backupFileName); - } - cy.get('.cvat-modal-export-project').contains('button', 'OK').click(); - cy.get('.cvat-notification-notice-export-backup-start').should('be.visible'); - cy.closeNotification('.cvat-notification-notice-export-backup-start'); -}); +Cypress.Commands.add( + 'backupProject', + ( + projectName, + backupFileName, + targetStorage = null, + useDefaultLocation = true, + ) => { + cy.projectActions(projectName); + cy.get('.cvat-project-actions-menu').contains('Backup Project').click(); + cy.get('.cvat-modal-export-project').should('be.visible'); + if (backupFileName) { + cy.get('.cvat-modal-export-project').find('.cvat-modal-export-filename-input').type(backupFileName); + } + if (!useDefaultLocation) { + cy.get('.cvat-modal-export-project') + .find('.cvat-settings-switch') + .click(); + cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-targetStorage-location', targetStorage.location) + .should('be.visible') + .click(); -Cypress.Commands.add('restoreProject', (archiveWithBackup) => { + if (targetStorage && targetStorage.cloudStorageId) { + cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').click(); + } + } + cy.get('.cvat-modal-export-project').contains('button', 'OK').click(); + cy.get('.cvat-notification-notice-export-backup-start').should('be.visible'); + cy.closeNotification('.cvat-notification-notice-export-backup-start'); + }, +); + +Cypress.Commands.add('restoreProject', (archiveWithBackup, sourceStorage = null) => { cy.intercept({ method: /PATCH|POST/, url: /\/api\/projects\/backup.*/ }).as('restoreProject'); cy.get('.cvat-create-project-dropdown').click(); cy.get('.cvat-import-project-button').click(); - cy.get('input[type=file]').attachFile(archiveWithBackup, { subjectType: 'drag-n-drop' }); - cy.get(`[title="${archiveWithBackup}"]`).should('be.visible'); + + if (sourceStorage) { + cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.ant-select-selection-item').click(); + }); + cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location) + .should('be.visible') + .click(); + if (sourceStorage.cloudStorageId) { + cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-cloud-storage-select-provider').click(); + cy.get('.cvat-modal-import-backup') + .find('.cvat-modal-import-filename-input') + .type(archiveWithBackup); + } + } else { + console.log('file: ', archiveWithBackup); + cy.get('input[type="file"]').attachFile(archiveWithBackup, { subjectType: 'drag-n-drop' }); + cy.get(`[title="${archiveWithBackup}"]`).should('be.visible'); + } + cy.contains('button', 'OK').click(); cy.get('.cvat-notification-notice-import-backup-start').should('be.visible'); cy.closeNotification('.cvat-notification-notice-import-backup-start'); @@ -169,7 +213,7 @@ Cypress.Commands.add('restoreProject', (archiveWithBackup) => { cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); cy.wait('@restoreProject').its('response.statusCode').should('equal', 204); cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); - cy.wait('@restoreProject', { timeout: 5000 }).its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject', { timeout: 2000 }).its('response.statusCode').should('equal', 202); cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); cy.contains('The project has been restored succesfully. Click here to open') .should('exist') diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js index dfa79a691dc..8fc15b30144 100644 --- a/tests/cypress/support/index.js +++ b/tests/cypress/support/index.js @@ -1,4 +1,5 @@ // Copyright (C) 2020-2022 Intel Corporation +// Copyright (C) 2022 CVAT.ai Corporation // // SPDX-License-Identifier: MIT @@ -10,6 +11,7 @@ require('./commands_filters_feature'); require('./commands_models'); require('./commands_opencv'); require('./commands_organizations'); +require('./commands_cloud_storages'); require('@cypress/code-coverage/support'); require('cypress-real-events/support'); From eb5f811b533a6f5e5c8032d906bd5a3a83209ce7 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 00:32:15 +0200 Subject: [PATCH 53/60] Fix typo --- .../case_117_backup_restore_project_to_various_storages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js index 3ee85514c20..ede077ec165 100644 --- a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js +++ b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js @@ -5,7 +5,7 @@ /// context('Tests source & target storage for backups.', () => { - const backupArchiveName = 'task_backup'; + const backupArchiveName = 'project_backup'; let projectID = ''; let createdCloudStorageId; const caseId = '117'; From 8f843faedab7c866cdb88b60435a4787a1c1af11 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 00:37:11 +0200 Subject: [PATCH 54/60] Rename variables --- ...t_storage_for_import_export_annotations.js | 48 ++++++++--------- ...k_storage_for_import_export_annotations.js | 52 +++++++++---------- ...m_storage_for_import_export_annotations.js | 36 ++++++------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js index a729e25dd5d..279e96e11e1 100644 --- a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js @@ -50,7 +50,7 @@ context('Tests for source and target storage.', () => { cloudStorageId: undefined, }; - const firstProject = { + const project = { name: `Case ${caseId}`, label: labelName, attrName: 'color', @@ -68,7 +68,7 @@ context('Tests for source and target storage.', () => { }, }; - const firstTask = { + const task = { name: taskName, label: labelName, attrName, @@ -77,7 +77,7 @@ context('Tests for source and target storage.', () => { multiAttrParams: false, forProject: true, attachToProject: true, - projectName: firstProject.name, + projectName: project.name, advancedConfiguration: { sourceStorage: { disableSwitch: true, @@ -99,16 +99,16 @@ context('Tests for source and target storage.', () => { cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); cy.createZipArchive(directoryToArchive, archivePath); cy.goToProjectsList(); - firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; - firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + project.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + project.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; cy.createProjects( - firstProject.name, - firstProject.label, - firstProject.attrName, - firstProject.attrVaue, - firstProject.multiAttrParams, - firstProject.advancedConfiguration, + project.name, + project.label, + project.attrName, + project.attrVaue, + project.multiAttrParams, + project.advancedConfiguration, ); }); @@ -117,7 +117,7 @@ context('Tests for source and target storage.', () => { cy.deleteCloudStorage(cloudStorageData.displayName); cy.logout(); cy.getAuthKey().then((authKey) => { - cy.deleteProjects(authKey, [firstProject.name]); + cy.deleteProjects(authKey, [project.name]); }); }); @@ -126,19 +126,19 @@ context('Tests for source and target storage.', () => { // create an annotation task with default project source and target storages cy.goToTaskList(); cy.createAnnotationTask( - firstTask.name, - firstTask.label, - firstTask.attrName, - firstTask.textDefaultValue, + task.name, + task.label, + task.attrName, + task.textDefaultValue, dataArchiveName, - firstTask.multiAttrParams, + task.multiAttrParams, null, - firstTask.forProject, - firstTask.attachToProject, - firstTask.projectName, + task.forProject, + task.attachToProject, + task.projectName, ); cy.goToTaskList(); - cy.openTask(firstTask.name); + cy.openTask(task.name); // create dummy annotations and export them to "public" minio bucket cy.openJob(); @@ -150,7 +150,7 @@ context('Tests for source and target storage.', () => { type: 'annotations', format, archiveCustomeName: 'job_annotations', - targetStorage: firstProject.advancedConfiguration.targetStorage, + targetStorage: project.advancedConfiguration.targetStorage, }; cy.exportJob(exportParams); cy.waitForFileUploadToCloudStorage(); @@ -171,7 +171,7 @@ context('Tests for source and target storage.', () => { format.split(' ')[0], 'job_annotations.zip', '.cvat-modal-content-load-job-annotation', - firstProject.advancedConfiguration.sourceStorage, + project.advancedConfiguration.sourceStorage, ); cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); @@ -179,7 +179,7 @@ context('Tests for source and target storage.', () => { cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.goToTaskList(); - cy.deleteTask(firstTask.name); + cy.deleteTask(task.name); }); }); }); diff --git a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js index 3e10a4dd482..8b23dee5a69 100644 --- a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js @@ -51,7 +51,7 @@ context('Tests for source and target storage.', () => { cloudStorageId: undefined, }; - const firstProject = { + const project = { name: `Case ${caseId}`, label: labelName, attrName: 'color', @@ -69,7 +69,7 @@ context('Tests for source and target storage.', () => { }, }; - const firstTask = { + const task = { name: taskName, label: labelName, attrName, @@ -78,7 +78,7 @@ context('Tests for source and target storage.', () => { multiAttrParams: false, forProject: true, attachToProject: true, - projectName: firstProject.name, + projectName: project.name, advancedConfiguration: { sourceStorage: { disableSwitch: true, @@ -100,16 +100,16 @@ context('Tests for source and target storage.', () => { cy.imageGenerator(imagesFolder, imageFileName, width, height, color, posX, posY, labelName, imagesCount); cy.createZipArchive(directoryToArchive, archivePath); cy.goToProjectsList(); - firstProject.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; - firstProject.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; + project.advancedConfiguration.sourceStorage.cloudStorageId = createdCloudStorageId; + project.advancedConfiguration.targetStorage.cloudStorageId = createdCloudStorageId; cy.createProjects( - firstProject.name, - firstProject.label, - firstProject.attrName, - firstProject.attrVaue, - firstProject.multiAttrParams, - firstProject.advancedConfiguration, + project.name, + project.label, + project.attrName, + project.attrVaue, + project.multiAttrParams, + project.advancedConfiguration, ); }); @@ -118,7 +118,7 @@ context('Tests for source and target storage.', () => { cy.deleteCloudStorage(cloudStorageData.displayName); cy.logout(); cy.getAuthKey().then((authKey) => { - cy.deleteProjects(authKey, [firstProject.name]); + cy.deleteProjects(authKey, [project.name]); }); }); @@ -127,19 +127,19 @@ context('Tests for source and target storage.', () => { // create an annotation task with custom local source & target storages cy.goToTaskList(); cy.createAnnotationTask( - firstTask.name, - firstTask.label, - firstTask.attrName, - firstTask.textDefaultValue, + task.name, + task.label, + task.attrName, + task.textDefaultValue, dataArchiveName, - firstTask.multiAttrParams, - firstTask.advancedConfiguration, - firstTask.forProject, - firstTask.attachToProject, - firstTask.projectName, + task.multiAttrParams, + task.advancedConfiguration, + task.forProject, + task.attachToProject, + task.projectName, ); cy.goToTaskList(); - cy.openTask(firstTask.name); + cy.openTask(task.name); // create dummy annotations and export them to default local storage cy.openJob(); @@ -152,7 +152,7 @@ context('Tests for source and target storage.', () => { type: 'annotations', format, archiveCustomeName: 'job_annotations', - targetStorage: firstProject.advancedConfiguration.targetStorage, + targetStorage: project.advancedConfiguration.targetStorage, }; cy.exportJob(exportParams); cy.getDownloadFileName().then((file) => { @@ -170,7 +170,7 @@ context('Tests for source and target storage.', () => { it('Import job annotations from default minio bucket that was attached to the task in the project.', () => { cy.goToTaskList(); - cy.openTask(firstTask.name); + cy.openTask(task.name); cy.openJob(); // upload annotations from default local storage @@ -180,7 +180,7 @@ context('Tests for source and target storage.', () => { format.split(' ')[0], annotationsArchiveName, '.cvat-modal-content-load-job-annotation', - firstTask.advancedConfiguration.sourceStorage, + task.advancedConfiguration.sourceStorage, ); cy.get('.cvat-notification-notice-upload-annotations-fail').should('not.exist'); @@ -188,7 +188,7 @@ context('Tests for source and target storage.', () => { cy.get('#cvat-objects-sidebar-state-item-1').should('exist'); cy.goToTaskList(); - cy.deleteTask(firstTask.name); + cy.deleteTask(task.name); }); }); }); diff --git a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js index 0247d09bf5e..2a34e6f5a52 100644 --- a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js @@ -43,7 +43,7 @@ context('Import and export annotations: specify source and target storage in mod endpointUrl: `http://${serverHost}:9000`, }; - const firstProject = { + const project = { name: `Case ${caseId}`, label: labelName, attrName: 'color', @@ -51,7 +51,7 @@ context('Import and export annotations: specify source and target storage in mod multiAttrParams: false, }; - const firstTask = { + const task = { name: taskName, label: labelName, attrName, @@ -60,7 +60,7 @@ context('Import and export annotations: specify source and target storage in mod multiAttrParams: false, forProject: true, attachToProject: true, - projectName: firstProject.name, + projectName: project.name, }; before(() => { @@ -72,11 +72,11 @@ context('Import and export annotations: specify source and target storage in mod cy.goToProjectsList(); cy.createProjects( - firstProject.name, - firstProject.label, - firstProject.attrName, - firstProject.attrVaue, - firstProject.multiAttrParams, + project.name, + project.label, + project.attrName, + project.attrVaue, + project.multiAttrParams, ); }); @@ -85,7 +85,7 @@ context('Import and export annotations: specify source and target storage in mod cy.deleteCloudStorage(cloudStorageData.displayName); cy.logout(); cy.getAuthKey().then((authKey) => { - cy.deleteProjects(authKey, [firstProject.name]); + cy.deleteProjects(authKey, [project.name]); }); }); @@ -94,19 +94,19 @@ context('Import and export annotations: specify source and target storage in mod // create an annotation task with local source & target storages cy.goToTaskList(); cy.createAnnotationTask( - firstTask.name, - firstTask.label, - firstTask.attrName, - firstTask.textDefaultValue, + task.name, + task.label, + task.attrName, + task.textDefaultValue, dataArchiveName, - firstTask.multiAttrParams, + task.multiAttrParams, null, - firstTask.forProject, - firstTask.attachToProject, - firstTask.projectName, + task.forProject, + task.attachToProject, + task.projectName, ); cy.goToTaskList(); - cy.openTask(firstTask.name); + cy.openTask(task.name); cy.openJob(); // create dummy annotations and export them to "public" minio bucket From 9663cc490350f4dbbc1124e5a4b195e6d3a846e0 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 00:42:12 +0200 Subject: [PATCH 55/60] debug --- tests/cypress/support/commands_cloud_storages.js | 1 - tests/cypress/support/commands_projects.js | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/cypress/support/commands_cloud_storages.js b/tests/cypress/support/commands_cloud_storages.js index 53fff37f025..ad65f0bdba3 100644 --- a/tests/cypress/support/commands_cloud_storages.js +++ b/tests/cypress/support/commands_cloud_storages.js @@ -38,7 +38,6 @@ Cypress.Commands.add('attachS3Bucket', (data) => { cy.contains('button', 'Submit').click(); }); cy.wait('@createCloudStorage').then((interseption) => { - console.log(interseption); expect(interseption.response.statusCode).to.be.equal(201); createdCloudStorageId = interseption.response.body.id; }); diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 9f32bfeecf2..2a0637730d2 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -200,7 +200,6 @@ Cypress.Commands.add('restoreProject', (archiveWithBackup, sourceStorage = null) .type(archiveWithBackup); } } else { - console.log('file: ', archiveWithBackup); cy.get('input[type=file]').attachFile(archiveWithBackup, { subjectType: 'drag-n-drop' }); cy.get(`[title="${archiveWithBackup}"]`).should('be.visible'); } From bb6eed048a30fe00609734854bdd9049e8023322 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 00:56:52 +0200 Subject: [PATCH 56/60] Revert timeout --- tests/cypress/support/commands_projects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 2a0637730d2..3153eb45791 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -212,7 +212,7 @@ Cypress.Commands.add('restoreProject', (archiveWithBackup, sourceStorage = null) cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); cy.wait('@restoreProject').its('response.statusCode').should('equal', 204); cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); - cy.wait('@restoreProject', { timeout: 2000 }).its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject', { timeout: 5000 }).its('response.statusCode').should('equal', 202); cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); cy.contains('The project has been restored succesfully. Click here to open') .should('exist') From f734a70491db8a7a0f351b3249d6ee6b6feb6d62 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 01:52:29 +0200 Subject: [PATCH 57/60] Fix server host --- .../case_117_backup_restore_project_to_various_storages.js | 2 +- ...use_default_project_storage_for_import_export_annotations.js | 2 +- ...14_use_default_task_storage_for_import_export_annotations.js | 2 +- ...case_115_use_custom_storage_for_import_export_annotations.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js index ede077ec165..8581fb4db70 100644 --- a/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js +++ b/tests/cypress/integration/actions_projects_models/case_117_backup_restore_project_to_various_storages.js @@ -25,7 +25,7 @@ context('Tests source & target storage for backups.', () => { const imagesFolder = `cypress/fixtures/${imageFileName}`; const directoryToArchive = imagesFolder; - const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + const serverHost = Cypress.config('baseUrl').includes('3000') ? 'localhost' : 'minio'; const cloudStorageData = { displayName: 'Demo bucket', diff --git a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js index 279e96e11e1..6e54fb0315c 100644 --- a/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_113_use_default_project_storage_for_import_export_annotations.js @@ -36,7 +36,7 @@ context('Tests for source and target storage.', () => { secondY: 450, }; - const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + const serverHost = Cypress.config('baseUrl').includes('3000') ? 'localhost' : 'minio'; const cloudStorageData = { displayName: 'Demo bucket', diff --git a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js index 8b23dee5a69..70d01434a2e 100644 --- a/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_114_use_default_task_storage_for_import_export_annotations.js @@ -37,7 +37,7 @@ context('Tests for source and target storage.', () => { secondY: 450, }; - const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + const serverHost = Cypress.config('baseUrl').includes('3000') ? 'localhost' : 'minio'; const cloudStorageData = { displayName: 'Demo bucket', diff --git a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js index 2a34e6f5a52..5fb7e1d816f 100644 --- a/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js +++ b/tests/cypress/integration/actions_tasks3/case_115_use_custom_storage_for_import_export_annotations.js @@ -34,7 +34,7 @@ context('Import and export annotations: specify source and target storage in mod secondY: 450, }; - const serverHost = Cypress.config('baseUrl').includes('localhost') ? 'localhost' : 'minio'; + const serverHost = Cypress.config('baseUrl').includes('3000') ? 'localhost' : 'minio'; const cloudStorageData = { displayName: 'Demo bucket', From e4797d5cd73e3a9ab10220bf78c253f4e8545a41 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 14:41:11 +0200 Subject: [PATCH 58/60] Fix test with project backup restore --- tests/cypress/support/commands_projects.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 3153eb45791..889e9c9e574 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -208,12 +208,19 @@ Cypress.Commands.add('restoreProject', (archiveWithBackup, sourceStorage = null) cy.get('.cvat-notification-notice-import-backup-start').should('be.visible'); cy.closeNotification('.cvat-notification-notice-import-backup-start'); - cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); - cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); - cy.wait('@restoreProject').its('response.statusCode').should('equal', 204); - cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); - cy.wait('@restoreProject', { timeout: 5000 }).its('response.statusCode').should('equal', 202); - cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); + if (!sourceStorage || !sourceStorage.cloudStorageId) { + cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); + cy.wait('@restoreProject').its('response.statusCode').should('equal', 204); + cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject', { timeout: 5000 }).its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); + } else { + cy.wait('@restoreProject').its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject', { timeout: 3000 }).its('response.statusCode').should('equal', 202); + cy.wait('@restoreProject').its('response.statusCode').should('equal', 201); + } + cy.contains('The project has been restored succesfully. Click here to open') .should('exist') .and('be.visible'); From 642bc4f1a9dc14db1e285ff34612fc458a3c6893 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 15:26:01 +0200 Subject: [PATCH 59/60] small refactoring --- .../select-cloud-storage.tsx | 2 +- .../src/components/storage/storage-field.tsx | 15 ++++++++---- tests/cypress/support/commands.js | 24 +++++++++---------- tests/cypress/support/commands_projects.js | 12 +++++----- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx index 0812fecfae4..376fa72f340 100644 --- a/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx +++ b/cvat-ui/src/components/select-cloud-storage/select-cloud-storage.tsx @@ -127,7 +127,7 @@ function SelectCloudStorage(props: Props): JSX.Element { setSearchPhrase(selectedCloudStorage?.displayName || ''); }} allowClear - className={`cvat-search${!name ? '-' : `-${name[0]}-`}cloud-storage-field`} + className={`cvat-search${!name ? '-' : `-${name[0].replace('Storage', '-storage')}-`}cloud-storage-field`} > diff --git a/cvat-ui/src/components/storage/storage-field.tsx b/cvat-ui/src/components/storage/storage-field.tsx index 44617c526f3..410c3218a84 100644 --- a/cvat-ui/src/components/storage/storage-field.tsx +++ b/cvat-ui/src/components/storage/storage-field.tsx @@ -31,6 +31,11 @@ export default function StorageField(props: Props): JSX.Element { } = props; const [cloudStorage, setCloudStorage] = useState(null); const [potentialCloudStorage, setPotentialCloudStorage] = useState(''); + const [storageType, setStorageType] = useState(''); + + useEffect(() => { + setStorageType(locationName[0].replace('Storage', '-storage')); + }, [locationName]); function renderCloudStorage(): JSX.Element { return ( @@ -73,19 +78,19 @@ export default function StorageField(props: Props): JSX.Element { if (onChangeLocationValue) onChangeLocationValue(StorageLocation.LOCAL); }} allowClear - className={`cvat-select-${locationName[0]}-storage`} + className={`cvat-select-${storageType}`} > diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 3006215d320..2bf4b917fc1 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -652,13 +652,13 @@ Cypress.Commands.add('advancedConfiguration', (advancedConfigurationParams) => { cy.get('.ant-collapse-content-box').find('#useProjectSourceStorage').click(); } - cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.cvat-select-source-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location).should('be.visible').click(); + cy.contains('.cvat-select-source-storage-location', sourceStorage.location).should('be.visible').click(); if (sourceStorage.cloudStorageId) { - cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-search-source-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } } @@ -670,13 +670,13 @@ Cypress.Commands.add('advancedConfiguration', (advancedConfigurationParams) => { cy.get('.ant-collapse-content-box').find('#useProjectTargetStorage').click(); } - cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.cvat-select-target-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-targetStorage-location', targetStorage.location).should('be.visible').click(); + cy.contains('.cvat-select-target-storage-location', targetStorage.location).should('be.visible').click(); if (targetStorage.cloudStorageId) { - cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-search-target-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').last().click(); } } @@ -714,14 +714,14 @@ Cypress.Commands.add( cy.get('.cvat-modal-import-dataset') .find('.cvat-modal-import-switch-use-default-storage') .click(); - cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.cvat-select-source-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location) + cy.contains('.cvat-select-source-storage-location', sourceStorage.location) .should('be.visible') .click(); if (sourceStorage.cloudStorageId) { - cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-search-source-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } } @@ -977,13 +977,13 @@ Cypress.Commands.add('exportJob', ({ } if (!useDefaultLocation) { cy.get('.cvat-modal-export-job').find('.cvat-settings-switch').click(); - cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.cvat-select-target-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-targetStorage-location', targetStorage.location).should('be.visible').click(); + cy.contains('.cvat-select-target-storage-location', targetStorage.location).should('be.visible').click(); if (targetStorage.cloudStorageId) { - cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-search-target-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } } diff --git a/tests/cypress/support/commands_projects.js b/tests/cypress/support/commands_projects.js index 889e9c9e574..a835c88aac1 100644 --- a/tests/cypress/support/commands_projects.js +++ b/tests/cypress/support/commands_projects.js @@ -162,15 +162,15 @@ Cypress.Commands.add( cy.get('.cvat-modal-export-project') .find('.cvat-settings-switch') .click(); - cy.get('.cvat-select-targetStorage-storage').within(() => { + cy.get('.cvat-select-target-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-targetStorage-location', targetStorage.location) + cy.contains('.cvat-select-target-storage-location', targetStorage.location) .should('be.visible') .click(); if (targetStorage && targetStorage.cloudStorageId) { - cy.get('.cvat-search-targetStorage-cloud-storage-field').click(); + cy.get('.cvat-search-target-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); } } @@ -186,14 +186,14 @@ Cypress.Commands.add('restoreProject', (archiveWithBackup, sourceStorage = null) cy.get('.cvat-import-project-button').click(); if (sourceStorage) { - cy.get('.cvat-select-sourceStorage-storage').within(() => { + cy.get('.cvat-select-source-storage').within(() => { cy.get('.ant-select-selection-item').click(); }); - cy.contains('.cvat-select-sourceStorage-location', sourceStorage.location) + cy.contains('.cvat-select-source-storage-location', sourceStorage.location) .should('be.visible') .click(); if (sourceStorage.cloudStorageId) { - cy.get('.cvat-search-sourceStorage-cloud-storage-field').click(); + cy.get('.cvat-search-source-storage-cloud-storage-field').click(); cy.get('.cvat-cloud-storage-select-provider').click(); cy.get('.cvat-modal-import-backup') .find('.cvat-modal-import-filename-input') From cedd4775d26e61c9103be95b0ec6abf6721987fd Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 14 Sep 2022 16:30:12 +0200 Subject: [PATCH 60/60] Update issue_2473_import_annotations_frames_dots_in_name --- .../issue_2473_import_annotations_frames_dots_in_name.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js index 81f6c36f903..bacdf12cb3d 100644 --- a/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js +++ b/tests/cypress/integration/actions_tasks/issue_2473_import_annotations_frames_dots_in_name.js @@ -112,12 +112,12 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox it('Upload annotation with YOLO format to job.', () => { cy.interactMenu('Upload annotations'); + cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); uploadAnnotation( dumpType.split(' ')[0], annotationArchiveName, '.cvat-modal-content-load-job-annotation', ); - cy.intercept('GET', '/api/jobs/**/annotations?**').as('uploadAnnotationsGet'); cy.wait('@uploadAnnotationsGet').its('response.statusCode').should('equal', 200); cy.contains('Annotations have been loaded').should('be.visible'); cy.closeNotification('.ant-notification-notice-info');