-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3122 from dhis2/dev
feat: merge dev to master
- Loading branch information
Showing
29 changed files
with
2,292 additions
and
1,176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,265 @@ | ||
| import { EventLayer } from '../elements/event_layer.js' | ||
| import { CURRENT_YEAR, EXTENDED_TIMEOUT } from '../support/util.js' | ||
|
|
||
| Cypress.on('uncaught:exception', (err) => { | ||
| if ( | ||
| err.message.includes( | ||
| 'ResizeObserver loop completed with undelivered notifications.' | ||
| ) | ||
| ) { | ||
| return false | ||
| } | ||
| }) | ||
|
|
||
| const map = { | ||
| id: 'eDlFx0jTtV9', | ||
| name: 'ANC: LLITN Cov Chiefdom this year', | ||
| downloadFileNamePrefix: 'ANC LLITN Cov Chiefdom this year', | ||
| cardTitle: 'ANC LLITN coverage', | ||
| } | ||
|
|
||
| describe('data table', () => { | ||
| it('opens data table and filters and sorts', () => { | ||
| cy.visit(`/#/${map.id}`, EXTENDED_TIMEOUT) | ||
| cy.get('canvas', EXTENDED_TIMEOUT).should('be.visible') | ||
|
|
||
| cy.getByDataTest('moremenubutton').first().click() | ||
|
|
||
| cy.getByDataTest('more-menu') | ||
| .find('li') | ||
| .not('.disabled') | ||
| .should('have.length', 6) | ||
|
|
||
| cy.getByDataTest('more-menu') | ||
| .find('li') | ||
| .contains('Show data table') | ||
| .click() | ||
|
|
||
| //check that the bottom panel is present | ||
| cy.getByDataTest('bottom-panel').should('be.visible') | ||
|
|
||
| // check number of columns | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-datatablecellhead') | ||
| .should('have.length', 10) | ||
|
|
||
| // Filter by name | ||
| cy.getByDataTest('data-table-column-filter-input-Name') | ||
| .find('input') | ||
| .type('bar') | ||
|
|
||
| // check that the filter returned the correct number of rows | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 7) | ||
|
|
||
| // confirm that the sort order is initially ascending by Name | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .first() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', 'Bargbe') | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .last() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', 'Upper Bambara') | ||
|
|
||
| // Sort by name | ||
| cy.get('button[title="Sort by Name"]').click() | ||
|
|
||
| // confirm that the rows are sorted by Name descending | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .first() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', 'Upper Bambara') | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .last() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', 'Bargbe') | ||
|
|
||
| // filter by Value (numeric) | ||
| cy.getByDataTest('data-table-column-filter-input-Value') | ||
| .find('input') | ||
| .type('>26') | ||
|
|
||
| // check that the (combined) filter returned the correct number of rows | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 5) | ||
|
|
||
| // Sort by value | ||
| cy.get('button[title="Sort by Value"]').click() | ||
|
|
||
| // check that the rows are sorted by Value ascending | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .first() | ||
| .find('td') | ||
| .eq(3) | ||
| .should('contain', '35') | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .last() | ||
| .find('td') | ||
| .eq(3) | ||
| .should('contain', '76') | ||
|
|
||
| // click on a row | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .first() | ||
| .click() | ||
|
|
||
| // check that the org unit profile drawer is opened | ||
| cy.getByDataTest('org-unit-profile').should('be.visible') | ||
| }) | ||
|
|
||
| it('opens the data table for an Event layer', () => { | ||
| cy.visit('/', EXTENDED_TIMEOUT) | ||
|
|
||
| const Layer = new EventLayer() | ||
|
|
||
| Layer.openDialog('Events') | ||
| .selectProgram('Malaria case registration') | ||
| .validateStage('Malaria case registration') | ||
| .selectTab('Period') | ||
| .selectPeriodType('Start/end dates') | ||
| .typeStartDate(`${CURRENT_YEAR - 1}-01-01`) | ||
| .typeEndDate(`${CURRENT_YEAR - 1}-01-15`) | ||
| .selectTab('Org Units') | ||
| .selectOu('Bo') | ||
| .addToMap() | ||
|
|
||
| Layer.validateDialogClosed(true) | ||
|
|
||
| Layer.validateCardTitle('Malaria case registration') | ||
|
|
||
| cy.getByDataTest('moremenubutton').first().click() | ||
|
|
||
| cy.getByDataTest('more-menu') | ||
| .find('li') | ||
| .contains('Show data table') | ||
| .not('disabled') | ||
| .click() | ||
|
|
||
| cy.getByDataTest('bottom-panel').should('be.visible') | ||
|
|
||
| // check number of columns | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-datatablecellhead') | ||
| .should('have.length', 9) | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-datatablecellhead') | ||
| .contains('Age in years', { matchCase: false }) | ||
| .should('be.visible') | ||
|
|
||
| // filter by Org unit | ||
| const ouName = 'Benduma' | ||
| cy.getByDataTest('data-table-column-filter-input-Org unit') | ||
| .find('input') | ||
| .type(ouName) | ||
|
|
||
| // check that all the rows have Org unit Yakaji | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .first() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', ouName) | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .last() | ||
| .find('td') | ||
| .eq(1) | ||
| .should('contain', ouName) | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 5) | ||
|
|
||
| // filter by Gender | ||
| cy.getByDataTest('data-table-column-filter-input-Gender') | ||
| .find('input') | ||
| .type('Female') | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 4) | ||
|
|
||
| cy.getByDataTest('data-table-column-filter-input-Gender') | ||
| .find('input') | ||
| .clear() | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 5) | ||
|
|
||
| // filter by Age in years (numeric) | ||
| cy.getByDataTest('data-table-column-filter-input-Age in years') | ||
| .find('input') | ||
| .type('<51') | ||
|
|
||
| // check that the filter returned the correct number of rows | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .should('have.length', 3) | ||
|
|
||
| // Sort by Age in years | ||
| cy.get('button[title="Sort by Age in years"]').click() | ||
|
|
||
| // confirm that the rows are sorted by Age in years descending | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .first() | ||
| .find('td') | ||
| .eq(7) | ||
| .should('contain', '44') | ||
|
|
||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .find('tr') | ||
| .last() | ||
| .find('td') | ||
| .eq(7) | ||
| .should('contain', '6') | ||
|
|
||
| // click on a row | ||
| cy.getByDataTest('bottom-panel') | ||
| .findByDataTest('dhis2-uicore-tablebody') | ||
| .findByDataTest('dhis2-uicore-datatablerow') | ||
| .first() | ||
| .click() | ||
|
|
||
| // check that the org unit profile drawer is NOT opened | ||
| cy.getByDataTest('org-unit-profile').should('not.exist') | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.