Merge remote-tracking branch 'origin/master' into DHIS2-15463-use-dhi…

…s2-ui-calendarinput-component-in-working-list

CHANGELOG.md

@@ -1,3 +1,97 @@
+## [101.1.3](https://github.com/dhis2/capture-app/compare/v101.1.2...v101.1.3) (2024-08-18)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([4164273](https://github.com/dhis2/capture-app/commit/4164273a380c24f57369f4f7c56dea4f0f6211a1))
+
+## [101.1.2](https://github.com/dhis2/capture-app/compare/v101.1.1...v101.1.2) (2024-08-15)
+
+
+### Bug Fixes
+
+* [DHIS2-17101] Consider prevent adding events to stage program rule ([#3706](https://github.com/dhis2/capture-app/issues/3706)) ([47ed42c](https://github.com/dhis2/capture-app/commit/47ed42c4c0d1a23ce93ce4ccbd02461ae22d2a18))
+
+## [101.1.1](https://github.com/dhis2/capture-app/compare/v101.1.0...v101.1.1) (2024-08-14)
+
+
+### Bug Fixes
+
+* [DHIS2-17883] revert validate values assigned from the rules engine ([#3758](https://github.com/dhis2/capture-app/issues/3758)) ([ea0e675](https://github.com/dhis2/capture-app/commit/ea0e67572d3edf5bee4adc19a3a845260cfa2abd))
+
+# [101.1.0](https://github.com/dhis2/capture-app/compare/v101.0.0...v101.1.0) (2024-08-14)
+
+
+### Features
+
+* [DHIS2-17655] Two event workspace ([#3726](https://github.com/dhis2/capture-app/issues/3726)) ([bad5312](https://github.com/dhis2/capture-app/commit/bad53124de25367fd633c0cfdd50efacb6eb022a))
+
+# [101.0.0](https://github.com/dhis2/capture-app/compare/v100.77.0...v101.0.0) (2024-08-14)
+
+
+### chore
+
+* **release:** stop support for 2.38 ([#3755](https://github.com/dhis2/capture-app/issues/3755)) ([2bbc649](https://github.com/dhis2/capture-app/commit/2bbc649b2cb638ac7c311bde16b79e1c39b2a65f))
+
+
+### BREAKING CHANGES
+
+* **release:** Bump version to 101.0.0 to facilitate potential fixes for 2.38
+
+# [100.77.0](https://github.com/dhis2/capture-app/compare/v100.76.1...v100.77.0) (2024-08-13)
+
+
+### Bug Fixes
+
+* [DHIS2-17352] Changing program in event workspace does nothing ([#3754](https://github.com/dhis2/capture-app/issues/3754)) ([c3ce444](https://github.com/dhis2/capture-app/commit/c3ce444db56cbb089c3023aa4c1866cc7f158c1f))
+
+
+### Features
+
+* [DHIS2-12288] add enrollment section description ([#3750](https://github.com/dhis2/capture-app/issues/3750)) ([1b4be20](https://github.com/dhis2/capture-app/commit/1b4be20b474f2f5b6c4eb66c37b0c509291b5bf6))
+
+## [100.76.1](https://github.com/dhis2/capture-app/compare/v100.76.0...v100.76.1) (2024-08-09)
+
+
+### Bug Fixes
+
+* [DHIS2-17632][DHIS2-17633] restrict invalid category combo for orgUnit ([#3738](https://github.com/dhis2/capture-app/issues/3738)) ([bfffe06](https://github.com/dhis2/capture-app/commit/bfffe069e3c16387dc0da6c08ed25b91f3f55bf1))
+
+# [100.76.0](https://github.com/dhis2/capture-app/compare/v100.75.1...v100.76.0) (2024-08-08)
+
+
+### Features
+
+* [DHIS2-17171] preview images in versions prior to 41 ([#3694](https://github.com/dhis2/capture-app/issues/3694)) ([2f51805](https://github.com/dhis2/capture-app/commit/2f51805b469d74b57bff7c927a9aa76420913ea1))
+
+## [100.75.1](https://github.com/dhis2/capture-app/compare/v100.75.0...v100.75.1) (2024-08-08)
+
+
+### Bug Fixes
+
+* [DHIS2-17859] Add missing ids to Enrollment plugin ([#3748](https://github.com/dhis2/capture-app/issues/3748)) ([19c77ec](https://github.com/dhis2/capture-app/commit/19c77ec50c2fff0deef948abd516726b51f95418))
+
+# [100.75.0](https://github.com/dhis2/capture-app/compare/v100.74.0...v100.75.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-17726] Plugins in Profile Widget ([#3709](https://github.com/dhis2/capture-app/issues/3709)) ([d783ade](https://github.com/dhis2/capture-app/commit/d783ade253e27badf03d267d8a3935186b170fd8))
+
+# [100.74.0](https://github.com/dhis2/capture-app/compare/v100.73.0...v100.74.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-17591][DHIS2-17607] Plugins in event forms ([#3684](https://github.com/dhis2/capture-app/issues/3684)) ([205b9f5](https://github.com/dhis2/capture-app/commit/205b9f5746f3d9b3d0d28035fd99e40b5649003c))
+
+# [100.73.0](https://github.com/dhis2/capture-app/compare/v100.72.0...v100.73.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-16125] hide program stage under certain circumstances ([#3735](https://github.com/dhis2/capture-app/issues/3735)) ([c6b6dc0](https://github.com/dhis2/capture-app/commit/c6b6dc0330d8c92d8334fb1f0b34a5524ebb2967))
+
 # [100.72.0](https://github.com/dhis2/capture-app/compare/v100.71.3...v100.72.0) (2024-08-06)
 
 

cypress/e2e/AllAccessibleRecordsPage/AllAccessibleRecordsPage.js

@@ -61,6 +61,8 @@ Then('the working list should be updated', () => {
         .click();
 
     cy.contains('WHOMCH Hemoglobin value')
+        .parents('tr')
+        .find('input[type="checkbox"]')
         .click();
 
     cy.contains('Save')

cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.feature

@@ -2,5 +2,5 @@ Feature: Hidden program stage
 
     Scenario: The user cannot add an event in a hidden program stage
         Given you add an enrollment event that will result in a rule effect to hide a program stage
-        Then the New Postpartum care visit event button is disabled in the stages and events widget
+        Then the Postpartum care visit stage should not be displayed in the Stages and Events widget
         And the Postpartum care visit button is disabled in the enrollmentEventNew page

cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js

@@ -43,9 +43,8 @@ Given('you add an enrollment event that will result in a rule effect to hide a p
     cy.contains('[data-test="dhis2-uicore-button"]', 'Save without completing').click();
 });
 
-Then('the New Postpartum care visit event button is disabled in the stages and events widget', () => {
-    cy.contains('[data-test="create-new-button"]', 'New Postpartum care visit event')
-        .should('be.disabled');
+Then('the Postpartum care visit stage should not be displayed in the Stages and Events widget', () => {
+    cy.get('[data-test="stages-and-events-widget"]').should('not.contain', 'Postpartum care visit');
 });
 
 Then('the Postpartum care visit button is disabled in the enrollmentEventNew page', () => {

cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.feature

@@ -60,8 +60,7 @@ Feature: User interacts with Stages and Events Widget
         Given you open the enrollment page by typing #enrollment?programId=IpHINAT79UW&orgUnitId=UgYg0YW7ZIh&teiId=fhFQhO0xILJ&enrollmentId=gPDueU02tn8
         Then you should see the disabled button New Birth event
 
-    # Waiting for pipline to update DB/DB update for 39 and 41
-    @user:trackerAutoTestRestricted @v=38 @v=40 @v=42
+    @user:trackerAutoTestRestricted
     Scenario: Program stage is hidden if no data read access
         And you open the enrollment page by typing #enrollment?enrollmentId=iNEq9d22Nyp&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&teiId=k4ODejBytgv
         Then the Care at birth program stage should be hidden

cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/EventWorkingListsUser.js

@@ -149,7 +149,8 @@ When('you open the column selector', () => {
 When('you select Household location and save from the column selector', () => {
     cy.get('aside[role="dialog"]')
         .contains('Household location')
-        .find('input')
+        .parents('tr')
+        .find('input[type="checkbox"]')
         .click();
 
     cy.get('aside[role="dialog"]')
@@ -388,11 +389,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"]')

cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/TeiWorkingListsUser.feature

@@ -131,7 +131,6 @@ Then the new My custom list is created
 When you delete the name My custom list
 Then the My custom list is deleted
 
-@v>=39
 Scenario: The user can open and select a program stage filter
 Given you open the main page with Ngelehun and Malaria focus investigation context
 When you open the program stage filters from the more filters dropdown menu
@@ -141,7 +140,6 @@ And you open the column selector
 And you select a data element columns and save from the column selector
 Then you see data elements specific filters and columns
 
-@v>=39
 Scenario: While in a program stage working list, the user can filter by both TEA and data elements
 Given you open the main page with Ngelehun, WHO RMNCH Tracker and First antenatal care visit context
 When you set the enrollment status filter to active
@@ -154,7 +152,6 @@ And you set the WHOMCH Smoking filter to No
 And you apply the current filter
 Then the list should display 1 row of data
 
-@v>=39
 Scenario: While in a program stage working list, the user can sort by both TEA and data elements
 Given you open the main page with Ngelehun, WHO RMNCH Tracker and First antenatal care visit context
 And you set the first name filter to u
@@ -166,7 +163,6 @@ When you click the WHOMCH Hemoglobin value column header
 Then the sort arrow should indicate descending order
 And the list should display data ordered descending by WHOMCH Hemoglobin
 
-@v>=39
 Scenario: The user can remove the program stage filter
 Given you open the main page with Ngelehun and WHO RMNCH Tracker context
 When you open the program stage filters from the more filters dropdown menu
@@ -176,7 +172,6 @@ Then you see program stage working list events
 When you remove the program stage filter
 Then you don't see program stage working list events
 
-@v>=39
 Scenario: The user can filter the events by scheduledAt date
 Given you open the main page with Ngelehun and WHO RMNCH Tracker context
 When you open the program stage filters from the more filters dropdown menu
@@ -189,20 +184,17 @@ And you select the events scheduled today
 And you apply the current filter
 Then you see the selected option in the scheduledAt filter
 
-@v>=39
 Scenario: The program stage working list configureation is kept when navigating
 Given you open the main page with Ngelehun and WHO RMNCH Tracker context and configure a program stage working list
 When you open an enrollment event from the working list
 And you go back using the browser button
 Then the program stage working list is loaded
 
-@v>=39
 Scenario: The program stage working list without a orgUnit selected redirects to a tracker event
 Given you open the main page with all accesible records in the WHO RMNCH Tracker context and configure a program stage working list
 When you open an enrollment event from the working list
 Then the tracker event URL contains the orgUnitId
 
-@v>=39
 Scenario: The user can open a program stage list without events
 Given you open the main page with Ngelehun and WHO RMNCH Tracker context and configure a program stage working list
 And you set the event visit date to Today

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();
@@ -186,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();
@@ -251,7 +254,8 @@ When('you open the column selector', () => {
 When('you select the organisation unit and save from the column selector', () => {
     cy.get('aside[role="dialog"]')
         .contains('Organisation unit')
-        .find('input')
+        .parents('tr')
+        .find('input[type="checkbox"]')
         .click();
 
     cy.get('aside[role="dialog"]')
@@ -580,9 +584,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', () => {
@@ -613,7 +617,8 @@ When('you select the Foci response program stage', () => {
 When('you select a data element columns and save from the column selector', () => {
     cy.get('aside[role="dialog"]')
         .contains('People included')
-        .find('input')
+        .parents('tr')
+        .find('input[type="checkbox"]')
         .click();
 
     cy.get('aside[role="dialog"]')
@@ -674,7 +679,8 @@ Then('you see scheduledAt filter', () => {
 When('you select a scheduledAt column and save from the column selector', () => {
     cy.get('aside[role="dialog"]')
         .contains('Appointment date')
-        .find('input')
+        .parents('tr')
+        .find('input[type="checkbox"]')
         .click();
 
     cy.get('aside[role="dialog"]')
@@ -741,10 +747,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 +767,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();

d2.config.js

@@ -4,7 +4,7 @@ const config = {
     type: 'app',
 
     id: '92b75fd0-34cc-451c-942f-3dd0f283bcbd',
-    minDHIS2Version: '2.38',
+    minDHIS2Version: '2.39',
     coreApp: true,
 
     entryPoints: {