From 1ba58bbb976d43a7d044e442c55b253e19a46c9f Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Thu, 1 Aug 2024 12:04:21 +0200 Subject: [PATCH 1/4] chore: replace ClickAwayListener with Layer onBackdropClick --- .../FilterRestMenu.component.js | 36 ++++++++--------- .../withEndColumnMenu/RowMenu.component.js | 40 +++++++++---------- .../components/Popper/Popper.component.js | 36 ++++++++--------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js index 0a2dea1776..6955d1145a 100644 --- a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js +++ b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js @@ -1,10 +1,9 @@ // @flow import React from 'react'; import { withStyles } from '@material-ui/core/styles'; -import { IconChevronDown16, IconChevronUp16, Button } from '@dhis2/ui'; +import { IconChevronDown16, IconChevronUp16, Button, Layer } from '@dhis2/ui'; import { Manager, Popper, Reference } from 'react-popper'; -import ClickAwayListener from '@material-ui/core/ClickAwayListener'; import Grow from '@material-ui/core/Grow'; import Paper from '@material-ui/core/Paper'; import MenuList from '@material-ui/core/MenuList'; @@ -168,17 +167,17 @@ class FilterRestMenuPlain extends React.Component { } {this.state.filterSelectorOpen && - - { - ({ ref, style, placement }) => ( -
- + + + { + ({ ref, style, placement }) => ( +
{ - -
- ) - } - } +
+ ) + } + + + } ); } diff --git a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js index 49362c29af..6a72369c5b 100644 --- a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js +++ b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js @@ -1,8 +1,7 @@ // @flow import * as React from 'react'; import { Manager, Popper, Reference } from 'react-popper'; -import ClickAwayListener from '@material-ui/core/ClickAwayListener'; -import { spacers, IconMore24, colors } from '@dhis2/ui'; +import { spacers, IconMore24, colors, Layer } from '@dhis2/ui'; import Grow from '@material-ui/core/Grow'; import Paper from '@material-ui/core/Paper'; import MenuList from '@material-ui/core/MenuList'; @@ -125,19 +124,19 @@ class Index extends React.Component { } {this.state.menuOpen && - - { - ({ ref, style, placement }) => ( -
- + + + { + ({ ref, style, placement }) => ( +
{ {this.renderMenuItems()} - -
- ) - } - } +
+ ) + } + + + } ); } diff --git a/src/core_modules/capture-core/components/Popper/Popper.component.js b/src/core_modules/capture-core/components/Popper/Popper.component.js index 36a8f9226a..832de14135 100644 --- a/src/core_modules/capture-core/components/Popper/Popper.component.js +++ b/src/core_modules/capture-core/components/Popper/Popper.component.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Manager, Popper, Reference } from 'react-popper'; import type { Placement } from '@popperjs/core/lib'; -import ClickAwayListener from '@material-ui/core/ClickAwayListener'; +import { Layer } from '@dhis2/ui'; import Grow from '@material-ui/core/Grow'; type Props = { @@ -74,18 +74,18 @@ export class MenuPopper extends React.Component { } {this.state.popperOpen && - - { - ({ ref, style, placement }) => ( -
- + + + { + ({ ref, style, placement }) => ( +
{ {getPopperContent(this.toggleMenu)} - -
- ) - } - } +
+ ) + } + + } ); } From 8e576f4b5d66eeb21fe2e48e01a6947bb1c2a7ce Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Thu, 1 Aug 2024 15:58:39 +0200 Subject: [PATCH 2/4] chore: fix Program stage wl cypress tests --- .../TeiWorkingListsUser.js | 24 +++++++++++-------- .../FilterRestMenu.component.js | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js index ccbda13971..f22a83561f 100644 --- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js +++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js @@ -42,10 +42,11 @@ Given('you open the main page with Ngelehun, WHO RMNCH Tracker and First antenat .within(() => { cy.contains('More filters') .click(); - cy.contains('Program stage') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Program stage').click()); + cy.get('[data-test="list-view-filter-contents"]') .contains('First antenatal care visit') .click(); @@ -66,10 +67,11 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis and House .within(() => { cy.contains('More filters') .click(); - cy.contains('Program stage') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Program stage').click()); + cy.get('[data-test="list-view-filter-contents"]') .contains('Household investigation') .click(); @@ -580,9 +582,9 @@ When('you open the program stage filters from the more filters dropdown menu', ( .within(() => { cy.contains('More filters') .click(); - cy.contains('Program stage') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Program stage').click()); }); Then('you see the program stages and the default events filters', () => { @@ -741,10 +743,11 @@ Given('you open the main page with Ngelehun and WHO RMNCH Tracker context and co .within(() => { cy.contains('More filters') .click(); - cy.contains('Program stage') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Program stage').click()); + cy.get('[data-test="list-view-filter-contents"]') .contains('Postpartum care visit') .click(); @@ -760,10 +763,11 @@ Given('you open the main page with all accesible records in the WHO RMNCH Tracke .within(() => { cy.contains('More filters') .click(); - cy.contains('Program stage') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Program stage').click()); + cy.get('[data-test="list-view-filter-contents"]') .contains('Postpartum care visit') .click(); diff --git a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js index 6955d1145a..01ed4cc4e1 100644 --- a/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js +++ b/src/core_modules/capture-core/components/ListView/Filters/FilterRestMenu/FilterRestMenu.component.js @@ -167,7 +167,7 @@ class FilterRestMenuPlain extends React.Component { } {this.state.filterSelectorOpen && - + From 7c43afc16f34ef288647ddf7c71ee86da4db1cda Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Mon, 5 Aug 2024 13:28:11 +0200 Subject: [PATCH 3/4] chore: fix events wl cypress tests --- .../EventWorkingListsUser/EventWorkingListsUser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js b/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js index f931718570..51cb81153b 100644 --- a/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js +++ b/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js @@ -388,11 +388,11 @@ When('you set the date of admission filter', () => { .within(() => { cy.contains('More filters') .click(); - - cy.contains('Date of admission') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('Date of admission').click()); + cy.get('[data-test="list-view-filter-contents"]') .within(() => { cy.get('input[type="text"]') From ae66341272325574014d69495a74bd9f355c7a08 Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Mon, 5 Aug 2024 14:52:46 +0200 Subject: [PATCH 4/4] chore: fix Program stage wl cypress tests --- .../TeiWorkingListsUser/TeiWorkingListsUser.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js index f22a83561f..5361178c6d 100644 --- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js +++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.js @@ -188,10 +188,11 @@ When('you set the WHOMCH Smoking filter to No', () => { .within(() => { cy.get('[data-test="more-filters"]').eq(1) .click(); - cy.contains('WHOMCH Smoking') - .click(); }); + cy.get('[data-test="more-filters-menu"]') + .within(() => cy.contains('WHOMCH Smoking').click()); + cy.get('[data-test="list-view-filter-contents"]') .contains('No') .click();