cvat-ai · nmanovic · Aug 6, 2021 · Jun 22, 2021 · Jun 23, 2021 · Jun 24, 2021
@@ -5,8 +5,7 @@ on:
       - 'master'
       - 'develop'
   pull_request:
-    branches:
-      - '*'
+
 jobs:
   Unit_testing:
       runs-on: ubuntu-latest

@@ -72,6 +72,7 @@ function ExportDatasetModal(): JSX.Element {
             message: 'Dataset export started',
             description: `Dataset export was started for ${instanceType} #${instance?.id}. ` +
                 'Download will start automaticly as soon as the dataset is ready.',
+            className: `cvat-notification-notice-export-${instanceType}-start`,
         });
     }, [instance?.id, instance instanceof core.classes.Project, instanceType]);
 
@@ -81,6 +82,7 @@ function ExportDatasetModal(): JSX.Element {
             visible={modalVisible}
             onCancel={closeModal}
             onOk={() => form.submit()}
+            className={`cvat-modal-export-${instanceType}`}
         >
             <Form
                 name='Export dataset'

@@ -68,9 +68,10 @@ context('Dump/Upload annotation.', { browser: '!firefox' }, () => {
         it('Save job. Dump annotation. Remove annotation. Save job.', () => {
             cy.saveJob('PATCH', 200, 'saveJobDump');
             cy.intercept('GET', '/api/v1/tasks/**/annotations**').as('dumpAnnotations');
-            cy.interactMenu('Dump annotations');
-            cy.get('.cvat-menu-dump-submenu-item').within(() => {
-                cy.contains(dumpType).click();
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').within(() => {
+                cy.get('.cvat-modal-export-select').should('contain.text', dumpType);
+                cy.contains('button', 'OK').click();
             });
             cy.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201);

@@ -66,10 +66,15 @@ context('Import annotations for frames with dots in name.', { browser: '!firefox
         it('Save job. Dump annotation to YOLO format. Remove annotation. Save job.', () => {
             cy.saveJob('PATCH', 200, 'saveJobDump');
             cy.intercept('GET', '/api/v1/tasks/**/annotations**').as('dumpAnnotations');
-            cy.interactMenu('Dump annotations');
-            cy.get('.cvat-menu-dump-submenu-item').within(() => {
-                cy.contains(dumpType).click();
-            });
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click();
+            cy.get('.ant-select-dropdown')
+                .not('.ant-select-dropdown-hidden')
+                .trigger('wheel', {deltaY: 700})
+                .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.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201);
             cy.removeAnnotations();

@@ -70,7 +70,7 @@ context('Export, import an annotation task.', { browser: '!firefox' }, () => {
             cy.get('.ant-dropdown')
                 .not('.ant-dropdown-hidden')
                 .within(() => {
-                    cy.contains('[role="menuitem"]', 'Export task').click().trigger('mouseout');
+                    cy.contains('[role="menuitem"]', new RegExp('^Export task$')).click().trigger('mouseout');
                 });
             cy.wait('@exportTask', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@exportTask').its('response.statusCode').should('equal', 201);

@@ -6,8 +6,9 @@
 
 import { taskName, labelName } from '../../support/const';
 
-context('Export as a dataset.', () => {
+context('Export task dataset.', () => {
     const caseId = '47';
+    const exportFormat = 'CVAT for images';
     const rectangleShape2Points = {
         points: 'By 2 Points',
         type: 'Shape',
@@ -21,16 +22,20 @@ context('Export as a dataset.', () => {
     before(() => {
         cy.openTaskJob(taskName);
         cy.createRectangle(rectangleShape2Points);
-        cy.saveJob();
+        cy.saveJob('PATCH', 200, 'saveJobExportDataset');
     });
 
     describe(`Testing case "${caseId}"`, () => {
-        it('Go to Menu. Press "Export as a dataset" -> "CVAT for images".', () => {
+        it(`Go to Menu. Press "Export task dataset" with the "${exportFormat}" format.`, () => {
             cy.intercept('GET', '/api/v1/tasks/**/dataset**').as('exportDataset');
-            cy.interactMenu('Export as a dataset');
-            cy.get('.cvat-menu-export-submenu-item').within(() => {
-                cy.contains('CVAT for images').click();
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').within(() => {
+                cy.get('.cvat-modal-export-select').should('contain.text', exportFormat);
+                cy.get('[type="checkbox"]').should('not.be.checked').check();
+                cy.contains('button', 'OK').click();
             });
+            cy.get('.cvat-notification-notice-export-task-start').should('exist');
+            cy.closeNotification('.cvat-notification-notice-export-task-start');
             cy.wait('@exportDataset', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@exportDataset').its('response.statusCode').should('equal', 201);
         });

@@ -51,13 +51,14 @@ context('Canvas 3D functionality. Dump/upload annotation. "Point Cloud" format',
         it('Save a job. Dump with "Point Cloud" format.', () => {
             cy.saveJob('PATCH', 200, 'saveJob');
             cy.intercept('GET', '/api/v1/tasks/**/annotations**').as('dumpAnnotations');
-            cy.interactMenu('Dump annotations');
-            cy.get('.cvat-menu-dump-submenu-item').then((subMenu) => {
-                expect(subMenu.length).to.be.equal(2);
-            });
-            cy.get('.cvat-menu-dump-submenu-item').within(() => {
-                cy.contains(dumpTypePC).click();
-            });
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click();
+            cy.get('.ant-select-dropdown')
+                .not('.ant-select-dropdown-hidden')
+                .contains('.cvat-modal-export-option-item', dumpTypePC)
+                .click();
+            cy.get('.cvat-modal-export-select').should('contain.text', dumpTypePC);
+            cy.get('.cvat-modal-export-task').contains('button', 'OK').click();
             cy.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201);
             cy.removeAnnotations();

@@ -51,10 +51,14 @@ context('Canvas 3D functionality. Dump/upload annotation. "Velodyne Points" form
         it('Save a job. Dump with "Velodyne Points" format.', () => {
             cy.saveJob('PATCH', 200, 'saveJob');
             cy.intercept('GET', '/api/v1/tasks/**/annotations**').as('dumpAnnotations');
-            cy.interactMenu('Dump annotations');
-            cy.get('.cvat-menu-dump-submenu-item').within(() => {
-                cy.contains(dumpTypeVC).click();
-            });
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click();
+            cy.get('.ant-select-dropdown')
+                .not('.ant-select-dropdown-hidden')
+                .contains('.cvat-modal-export-option-item', dumpTypeVC)
+                .click();
+            cy.get('.cvat-modal-export-select').should('contain.text', dumpTypeVC);
+            cy.get('.cvat-modal-export-task').contains('button', 'OK').click();
             cy.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
             cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201);
             cy.removeAnnotations();

@@ -15,6 +15,21 @@ context('Canvas 3D functionality. Export as a dataset.', () => {
     const dumpTypePC = 'Sly Point Cloud Format';
     const dumpTypeVC = 'Kitti Raw Format';
 
+    function exportDataset (format, as) {
+        cy.intercept('GET', '/api/v1/tasks/**/dataset**').as(as);
+        cy.interactMenu('Export task dataset');
+        cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click();
+        cy.get('.ant-select-dropdown')
+            .not('.ant-select-dropdown-hidden')
+            .contains('.cvat-modal-export-option-item', format)
+            .click();
+        cy.get('.cvat-modal-export-select').should('contain.text', format);
+        cy.get('.cvat-modal-export-task').find('[type="checkbox"]').should('not.be.checked').check();
+        cy.get('.cvat-modal-export-task').contains('button', 'OK').click();
+        cy.wait(`@${as}`, { timeout: 5000 }).its('response.statusCode').should('equal', 202);
+        cy.wait(`@${as}`).its('response.statusCode').should('equal', 201);
+    }
+
     before(() => {
         cy.openTask(taskName);
         cy.openJob();
@@ -25,23 +40,11 @@ context('Canvas 3D functionality. Export as a dataset.', () => {
 
     describe(`Testing case "${caseId}"`, () => {
         it('Export as a dataset with "Point Cloud" format.', () => {
-            cy.intercept('GET', '/api/v1/tasks/**/dataset**').as('exportDatasetPC');
-            cy.interactMenu('Export as a dataset');
-            cy.get('.cvat-menu-export-submenu-item').within(() => {
-                cy.contains(dumpTypePC).click();
-            });
-            cy.wait('@exportDatasetPC', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
-            cy.wait('@exportDatasetPC').its('response.statusCode').should('equal', 201);
+            exportDataset(dumpTypePC, 'exportDatasetPC');
         });
 
         it('Export as a dataset with "Velodyne Points" format.', () => {
-            cy.intercept('GET', '/api/v1/tasks/**/dataset**').as('exportDatasetVC');
-            cy.interactMenu('Export as a dataset');
-            cy.get('.cvat-menu-export-submenu-item').within(() => {
-                cy.contains(dumpTypeVC).click();
-            });
-            cy.wait('@exportDatasetVC', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
-            cy.wait('@exportDatasetVC').its('response.statusCode').should('equal', 201);
+            exportDataset(dumpTypeVC, 'exportDatasetVC');
             cy.removeAnnotations();
             cy.saveJob('PUT');
         });

@@ -6,7 +6,7 @@
 
 import { taskName, labelName } from '../../support/const';
 
-context('Dump annotation if cuboid created', () => {
+context('Dump annotation if cuboid created.', () => {
     const issueId = '1568';
     const createCuboidShape2Points = {
         points: 'From rectangle',
@@ -17,30 +17,33 @@ context('Dump annotation if cuboid created', () => {
         secondX: 350,
         secondY: 450,
     };
+    const dumpType = 'Datumaro';
 
     before(() => {
         cy.openTaskJob(taskName);
     });
 
     describe(`Testing issue "${issueId}"`, () => {
-        it('Create a cuboid', () => {
+        it('Create a cuboid.', () => {
             cy.createCuboid(createCuboidShape2Points);
-            cy.get('#cvat-objects-sidebar-state-item-1').should('contain', '1').and('contain', 'CUBOID SHAPE');
         });
-        it('Dump an annotation', () => {
-            cy.get('.cvat-annotation-header-left-group').within(() => {
-                cy.saveJob();
-                cy.get('button').contains('Menu').trigger('mouseover', { force: true });
-            });
-            cy.get('.cvat-annotation-menu').within(() => {
-                cy.get('[title="Dump annotations"]').trigger('mouseover');
-            });
-            cy.get('.cvat-menu-dump-submenu-item').within(() => {
-                cy.contains('Datumaro').click();
-            });
+
+        it('Dump an annotation.', () => {
+            cy.saveJob('PATCH', 200, `dump${dumpType}Format`);
+            cy.intercept('GET', '/api/v1/tasks/**/annotations**').as('dumpAnnotations');
+            cy.interactMenu('Export task dataset');
+            cy.get('.cvat-modal-export-task').find('.cvat-modal-export-select').click();
+            cy.get('.ant-select-dropdown')
+                .not('.ant-select-dropdown-hidden')
+                .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.wait('@dumpAnnotations', { timeout: 5000 }).its('response.statusCode').should('equal', 202);
+            cy.wait('@dumpAnnotations').its('response.statusCode').should('equal', 201);
         });
-        it('Error notification is not exists', () => {
-            cy.wait(5000);
+
+        it('Error notification is not exists.', () => {
             cy.get('.ant-notification-notice').should('not.exist');
         });
     });