Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-16262…

…_CustomEnrollmentOverviewSchema # Conflicts: # i18n/en.pot # src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js # src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.container.js # src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.types.js # src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js # src/core_modules/capture-core/components/WidgetEventEdit/widgetEventEdit.types.js
dhis2 · Jan 26, 2024 · df59069 · df59069
2 parents bdbc3b4 + eb28a78
commit df59069
Show file tree

Hide file tree

Showing 117 changed files with 4,712 additions and 3,106 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+# [100.53.0](https://github.com/dhis2/capture-app/compare/v100.52.0...v100.53.0) (2024-01-26)
+
+
+### Features
+
+* [DHIS2-15475] Form Field Plugins ([#3502](https://github.com/dhis2/capture-app/issues/3502)) ([2ccb87b](https://github.com/dhis2/capture-app/commit/2ccb87bb775056c701dfaf9b4f9494b0008a57c3))
+
+# [100.52.0](https://github.com/dhis2/capture-app/compare/v100.51.0...v100.52.0) (2024-01-25)
+
+
+### Features
+
+* [DHIS2-16204] make opt-in to new dashboard the default ([#3508](https://github.com/dhis2/capture-app/issues/3508)) ([5407d7c](https://github.com/dhis2/capture-app/commit/5407d7c98257e16cd647438a7cfe693a5fcd2e0e))
+
+# [100.51.0](https://github.com/dhis2/capture-app/compare/v100.50.7...v100.51.0) (2024-01-25)
+
+
+### Features
+
+* [DHIS2-15480] widget assignee ([#3412](https://github.com/dhis2/capture-app/issues/3412)) ([d61efae](https://github.com/dhis2/capture-app/commit/d61efae8b24ffb34a84e765bc397de87ce76c125))
+
+## [100.50.7](https://github.com/dhis2/capture-app/compare/v100.50.6...v100.50.7) (2024-01-23)
+
+
+### Bug Fixes
+
+* [DHIS2-15888] multi text element in program rules ([#3482](https://github.com/dhis2/capture-app/issues/3482)) ([fd0776d](https://github.com/dhis2/capture-app/commit/fd0776d2261b761c9985db3f6bfb0fda4a2ad18c))
+
 ## [100.50.6](https://github.com/dhis2/capture-app/compare/v100.50.5...v100.50.6) (2024-01-21)
 
 

diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm.feature b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm.feature
@@ -47,9 +47,8 @@ Feature: User interacts with the Enrollment New Event Workspace
     Then the input should throw an error with error-message Please provide a positive integer
 
   Scenario: User should be asked to create new event after completing a stage and choose to cancel
-    Given you open the main page with Ngelehun and Malaria focus investigation context
-    And you opt in to use the new enrollment Dashboard for Malaria focus investigation
-    Then you land on the enrollment new event page by having typed #/enrollmentEventNew?enrollmentId=zRfAPUpjoG3&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=CWaAcQYKVpq&teiId=S3JjTA4QMNe
+    Given you land on the enrollment new event page by having typed #/enrollmentEventNew?enrollmentId=zRfAPUpjoG3&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=CWaAcQYKVpq&teiId=S3JjTA4QMNe
+    And the data store is clean
     Then you see the following Enrollment: New Event
     And you see the widget header Foci investigation & classification
     And you type 2022-01-01 in the input number 0

diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/index.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/index.js
@@ -1,5 +1,6 @@
 import { Given, When, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
 import '../sharedSteps';
+import '../../sharedSteps';
 
 const showAllEventsInProgramStage = () => {
     cy.get('[data-test="dhis2-uicore-tablefoot"]')
@@ -16,16 +17,6 @@ Given('you open the main page with Ngelehun and Malaria focus investigation cont
     cy.visit('/#/?orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI');
 });
 
-When(/^you opt in to use the new enrollment Dashboard for (.*)$/, (program) => {
-    cy.get('[data-test="main-page-working-list"]').then(($wrapper) => {
-        if ($wrapper.find('[data-test="opt-in"]').length > 0) {
-            cy.contains('[data-test="dhis2-uicore-button"]', `Opt in for ${program}`).click();
-            cy.contains('[data-test="dhis2-uicore-button"]', 'Yes, opt in').click();
-            cy.contains('[data-test="dhis2-uicore-button"]', `Opt out for ${program}`);
-        }
-    });
-});
-
 Given(/^you land on the enrollment new event page by having typed (.*)$/, (url) => {
     cy.visit(url);
 });

diff --git a/cypress/e2e/EnrollmentPage/BreakingTheGlass.feature b/cypress/e2e/EnrollmentPage/BreakingTheGlass.feature
@@ -4,13 +4,12 @@ Feature: Breaking the glass page
   @skip
   Scenario: User with search scope access tries to access an enrollment in a protected program
     Given the tei created by this test is cleared from the database
-    And you opt temporarily in on new enrollment dashboard in Child programme and WHO RMNCH Tracker
+    And the data store is clean
     And you create a new tei in Child programme from Ngelehun CHC
     And you change program to WHO RMNCH Tracker
     And you enroll the tei from Njandama MCHP
     And you log out
     And you log in as tracker2 user
-    And you opt temporarily in on new enrollment dashboard in Child programme and WHO RMNCH Tracker
     And you select the new tei
     And you change program to WHO RMNCH Tracker
     Then you see the breaking the glass page

diff --git a/cypress/e2e/EnrollmentPage/BreakingTheGlass/index.js b/cypress/e2e/EnrollmentPage/BreakingTheGlass/index.js
@@ -1,5 +1,6 @@
 import { Given, When, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
 import '../sharedSteps';
+import '../../sharedSteps';
 
 Given('the tei created by this test is cleared from the database', () => {
     cy.buildApiUrl('tracker', 'trackedEntities?filter=w75KJ2mc4zz:like:Breaking&filter=zDhUuAYrxNC:like:TheGlass&trackedEntityType=nEenWmSyUEp&page=1&pageSize=5&ouMode=ACCESSIBLE')
@@ -12,10 +13,6 @@ Given('the tei created by this test is cleared from the database', () => {
             ));
 });
 
-And('you opt temporarily in on new enrollment dashboard in Child programme and WHO RMNCH Tracker', () => {
-    cy.visit('/#/?newDashboard=IpHINAT79UW,WSGAb5XwJ3Y');
-});
-
 And('you create a new tei in Child programme from Ngelehun CHC', () => {
     cy.visit('/#/new?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW');
     cy.get('[data-test="capture-ui-input"]')

diff --git a/cypress/e2e/MainPage.feature b/cypress/e2e/MainPage.feature
@@ -35,13 +35,14 @@ Feature: User interacts with Main page
         Then the current url is /#/?orgUnitId=DiszpKrYNg8&programId=uy2gU8kT1jF&selectedTemplateId=uy2gU8kT1jF-default
         And the TEI working list is displayed
 
-    Scenario: The admin user can optin to use the new Enrollment Dashboard
+    Scenario: The admin user can optout from using the new Enrollment Dashboard
         Given you open the main page with Ngelehun and child programme context
-        And you see the opt in component for Child Programme
-        When you opt in to use the new enrollment Dashboard for Child Programme
-        Then you see the opt out component for Child Programme
+        And the data store is clean
+        And you see the opt out component for Child Programme
         When you opt out to use the new enrollment Dashboard for Child Programme
         Then you see the opt in component for Child Programme
+        When you opt in to use the new enrollment Dashboard for Child Programme
+        Then you see the opt out component for Child Programme
 
     @v<41
     Scenario: The icon is rendered as an svg

diff --git a/cypress/e2e/NewPage.feature b/cypress/e2e/NewPage.feature
@@ -8,11 +8,12 @@ Feature: User creates a new entries from the registration page
   @v>=41
   Scenario: New person in Tracker Program > Filling the Allergies with multiple options
     Given you are in the WHO RMNCH program registration page
+    And the data store is clean
     When you fill in multiple Allergies options
     Then you can see the multiple selections in the form
     And you fill the WHO RMNCH program registration form with its required unique values
     And you click the save person submit button
-    Then you are navigated to the WHO RMNCH program in Tracker Capture app
+    Then you see the enrollment event Edit page
 
   Scenario: Viewing the registration page with incomplete program categories selection
     Given you are in the main page with no selections made
@@ -126,17 +127,19 @@ Feature: User creates a new entries from the registration page
 
   Scenario: New person > Submitting the form with unique name navigates you to the user dashboard
     Given you are in the Person registration page
+    And the data store is clean
     When you fill in a unique first name
     And you click the save person submit button
-    Then you are navigated to the Tracker Capture
+    Then you are navigated to the enrollment dashboard page without enrollment
 
   Scenario: New person > Submitting the form from the duplicates modal navigates you to the user dashboard
     Given you are in the Person registration page
+    And the data store is clean
     When you fill in the first name with value that has duplicates
     And you click the save person submit button
     And you see the possible duplicates modal
     And you submit the form again from the duplicates modal
-    Then you are navigated to the Tracker Capture
+    Then you are navigated to the enrollment dashboard page without enrollment
 
   Scenario: New person > Submitting the form shows a list with duplicates
     Given you are in the Person registration page
@@ -171,17 +174,19 @@ Feature: User creates a new entries from the registration page
 
   Scenario: New person in Tracker Program > Submitting the form with unique values navigates you to the user dashboard
     Given you are in the WHO RMNCH program registration page
+    And the data store is clean
     When you fill the WHO RMNCH program registration form with its required unique values
     And you click the save person submit button
-    Then you are navigated to the WHO RMNCH program in Tracker Capture app
+    Then you see the enrollment event Edit page
 
   Scenario: New person in Tracker Program > Submitting the form from the duplicates modal navigates you to the user dashboard
     Given you are in the WHO RMNCH program registration page
+    And the data store is clean
     When you fill the WHO RMNCH program registration form with its required values
     And you click the save person submit button
     And you see the possible duplicates modal
     When you submit the form again from the duplicates modal
-    Then you are navigated to the WHO RMNCH program in Tracker Capture app
+    Then you see the enrollment event Edit page
 
 
   Scenario: New person in Tracker Program > Submitting the form shows a list with duplicates
@@ -201,16 +206,11 @@ Feature: User creates a new entries from the registration page
     Then you see validation errors on the WHO RMNCH program registration page
 
   Scenario: Go to enrollment event when Open data entry form after enrollment is checked
-    Given you open the main page with Ngelehun and Malaria case diagnosis, treatment and investigation context
-    And you opt in to use the new enrollment Dashboard for Malaria case diagnosis, treatment and investigation
-    And you see the opt out component for Malaria case diagnosis, treatment and investigation
-    When you are in the Malaria case diagnosis, treatment and investigation program registration page
+    Given you are in the Malaria case diagnosis, treatment and investigation program registration page
+    And the data store is clean
     And you fill the Malaria case diagnosis registration form with values
     And you click the save malaria entity submit button
     Then you see the enrollment event Edit page
-    When you open the main page with Ngelehun and Malaria case diagnosis, treatment and investigation context
-    And you opt out to use the new enrollment Dashboard for Malaria case diagnosis, treatment and investigation
-    Then you see the opt in component for Malaria case diagnosis, treatment and investigation
 
 ## New enrollment of existing TEI
 

diff --git a/cypress/e2e/NewPage/index.js b/cypress/e2e/NewPage/index.js
@@ -487,10 +487,6 @@ And('you fill in child programme first name with value that has duplicates', ()
         .blur();
 });
 
-Then('you are navigated to the WHO RMNCH program in Tracker Capture app', () => {
-    cy.url().should('include', 'dashboard?tei=');
-    cy.url().should('include', 'ou=DiszpKrYNg8&program=WSGAb5XwJ3Y');
-});
 
 And('you fill the Child programme registration form with a first name with value that has duplicates', () => {
     cy.get('[data-test="capture-ui-input"]')

diff --git a/cypress/e2e/SearchPage.feature b/cypress/e2e/SearchPage.feature
@@ -24,10 +24,11 @@ Feature: User interacts with Search page
 
     Scenario: Searching using unique identifier returns results
         Given you are on the default search page
+        And the data store is clean
         When you select the search domain WHO RMNCH Tracker
         And you fill in the unique identifier field with values that will return a tracked entity instance
         And you click find
-        Then you are navigated to the Tracker Capture
+        Then you are navigated to the enrollment dashboard page
 
     # Scenario: Searching using attributes in Tracker Program returns no results
     #     Given you are on the default search page
@@ -96,23 +97,25 @@ Feature: User interacts with Search page
 
     Scenario: Searching using attributes in Tracker Program navigates user to the dashboard view
         Given you are on the default search page
+        And the data store is clean
         When you select the search domain WHO RMNCH Tracker
         And you expand the attributes search area
         And you fill in the last name with values that will return results
         And you click search
         And you can see the first page of the results
         And you click the view dashboard button
-        Then you are navigated to the Tracker Capture
+        Then you are navigated to the enrollment dashboard page
 
     Scenario: Searching using attributes in TEType navigates user to dashboard view
         Given you are on the default search page
+        And the data store is clean
         When you select the search domain Person
         And you expand the attributes search area
         And you fill in the the form with first name value: Cla
         And you click search
         And you can see the first page of the results
         And you click the view dashboard button
-        Then you are navigated to the Tracker Capture without program
+        Then you are navigated to the enrollment dashboard page without enrollment
 
     Scenario: Searching using attributes in Tracker Program domain has disabled pagination
         Given you are on the default search page
@@ -162,9 +165,10 @@ Feature: User interacts with Search page
 
     Scenario: Pressing enter should trigger search unique identifier returns results
         Given you are on the default search page
+        And the data store is clean
         When you select the search domain WHO RMNCH Tracker
         And you press enter after filling in the unique identifier field with values that will return a tracked entity instance
-        Then you are navigated to the Tracker Capture 
+        Then you are navigated to the enrollment dashboard page
 
     Scenario: Pressing enter should trigger search attributes returns results
         Given you are in the search page with the Child Programme being preselected from the url

diff --git a/cypress/e2e/SearchPage/index.js b/cypress/e2e/SearchPage/index.js
@@ -93,19 +93,6 @@ When('you fill in the unique identifier field with values that will return a tra
         .blur();
 });
 
-Then('you are navigated to the Tracker Capture', () => {
-    cy.url()
-        .should('include', 'dhis-web-tracker-capture/')
-        .should('include', 'dashboard?tei=')
-        .should('include', 'program=WSGAb5XwJ3Y');
-});
-
-Then('you are navigated to the Tracker Capture without program', () => {
-    cy.url()
-        .should('include', 'dhis-web-tracker-capture/')
-        .should('include', 'dashboard?tei=')
-        .should('include', 'tracked_entity_type=nEenWmSyUEp');
-});
 
 When('you fill in the first name with values that will return no results', () => {
     cy.get('[data-test="form-attributes"]')

diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetAssignee/index.js
@@ -0,0 +1,52 @@
+import { When, Then } from '@badeball/cypress-cucumber-preprocessor';
+
+When('you assign the user Geetha in the view mode', () => {
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-assignee-assign"]').click();
+        cy.get('[data-test="capture-ui-input"]').type('Geetha');
+        cy.contains('Geetha Alwan').click();
+        cy.get('[data-test="widget-assignee-save"]').click();
+    });
+});
+
+When('you assign the user Tracker demo User in the edit mode', () => {
+    cy
+        .get('[data-test="widget-enrollment-event"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(1)
+        .click();
+
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-assignee-edit"]').click();
+        cy.get('[data-test="dhis2-uicore-chip-remove"]').click();
+        cy.get('[data-test="capture-ui-input"]').type('Tracker demo');
+        cy.contains('Tracker demo User').click();
+        cy.get('[data-test="widget-assignee-save"]').click();
+    });
+});
+
+When('you remove the assigned user', () => {
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-assignee-edit"]').click();
+        cy.get('[data-test="dhis2-uicore-chip-remove"]').click();
+        cy.get('[data-test="widget-assignee-save"]').click();
+    });
+});
+
+Then('the event has the user Geetha Alwan assigned', () => {
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-contents"]').contains('Geetha Alwan').should('exist');
+    });
+});
+
+Then('the event has the user Tracker demo User assigned', () => {
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-contents"]').contains('Tracker demo User').should('exist');
+    });
+});
+
+Then('the event has no assignd user', () => {
+    cy.get('[data-test="widget-assignee"]').within(() => {
+        cy.get('[data-test="widget-contents"]').contains('No one is assigned to this event').should('exist');
+    });
+});
diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent.feature
@@ -102,4 +102,13 @@ Feature: The user interacts with the widgets on the enrollment edit event
     Given you land on the enrollment edit event page by having typed /#/enrollmentEventEdit?eventId=XGLkLlOXgmE&orgUnitId=DiszpKrYNg8
     Then the enrollment widget should be loaded
     When you click edit mode
-    Then list should contain the new comment: new test comment
+    Then list should contain the new comment: new test comment
+
+  Scenario: You can assign a user to a event
+  Given you land on the enrollment edit event page by having typed /#/enrollmentEventEdit?eventId=veuwiLC2x0e&orgUnitId=g8upMTyEZGZ
+  When you assign the user Geetha in the view mode
+  Then the event has the user Geetha Alwan assigned
+  When you assign the user Tracker demo User in the edit mode
+  Then the event has the user Tracker demo User assigned
+  When you remove the assigned user
+  Then the event has no assignd user
diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEnrollmentEditEvent/index.js
@@ -2,3 +2,5 @@ import '../sharedSteps';
 import '../WidgetEnrollment';
 import '../WidgetProfile';
 import '../WidgetEventComment';
+import '../WidgetAssignee';
+
diff --git a/cypress/e2e/sharedSteps.js b/cypress/e2e/sharedSteps.js
@@ -155,12 +155,15 @@ Then(/^the user ?(.*) see the following text: (.*)$/, (not, message) =>
     cy.contains(message).should(not ? 'not.exist' : 'exist'),
 );
 
-And('you navigated to the enrollment dashboard page', () => {
-    cy.url().should('include', 'enrollment?enrollmentId');
+And('you are navigated to the enrollment dashboard page', () => {
+    cy.url().should('include', 'enrollment?');
+    cy.url().should('include', 'enrollmentId');
 });
 
-And('you navigated to the enrollment dashboard page without enrollment', () => {
-    cy.url().should('include', 'enrollment?orgUnit');
+And('you are navigated to the enrollment dashboard page without enrollment', () => {
+    cy.url().should('include', 'enrollment?');
+    cy.url().should('not.include', 'enrollmentId');
+    cy.url().should('include', 'teiId');
 });
 
 Then('you should see no results found', () => {
@@ -209,3 +212,9 @@ When(/^you opt out to use the new enrollment Dashboard for (.*)$/, (program) =>
 Then(/^you see the opt in component for (.*)$/, (program) => {
     cy.contains('[data-test="dhis2-uicore-button"]', `Opt in for ${program}`);
 });
+
+And('the data store is clean', () => {
+    cy.buildApiUrl('dataStore/capture/useNewDashboard')
+        .then(dataStoreUrl =>
+            cy.request({ method: 'DELETE', url: dataStoreUrl, failOnStatusCode: false }));
+});