Merge remote-tracking branch 'origin/master' into DHIS2-16801-events-…

…scheduled-for-today-date-should-show-today

CHANGELOG.md

@@ -1,3 +1,59 @@
+## [101.16.4](https://github.com/dhis2/capture-app/compare/v101.16.3...v101.16.4) (2024-11-20)
+
+
+### Bug Fixes
+
+* [DHIS2-18019] related stages UI tweaks ([#3872](https://github.com/dhis2/capture-app/issues/3872)) ([7ea2240](https://github.com/dhis2/capture-app/commit/7ea2240b68408a0c4e8db624093c058f2b416584))
+
+## [101.16.3](https://github.com/dhis2/capture-app/compare/v101.16.2...v101.16.3) (2024-11-20)
+
+
+### Bug Fixes
+
+* [DHIS2-18444] stabilize possible duplicate modal cypress test ([#3886](https://github.com/dhis2/capture-app/issues/3886)) ([5b5b477](https://github.com/dhis2/capture-app/commit/5b5b477ed3a26c7eb04c4966802769fe973e1631))
+
+## [101.16.2](https://github.com/dhis2/capture-app/compare/v101.16.1...v101.16.2) (2024-11-19)
+
+
+### Bug Fixes
+
+* [DHIS2-16994] Image and File DE and TEA not Displayed in Changelog ([#3837](https://github.com/dhis2/capture-app/issues/3837)) ([9327210](https://github.com/dhis2/capture-app/commit/932721045126e02379f56a85af4f6586b836b4c0))
+
+## [101.16.1](https://github.com/dhis2/capture-app/compare/v101.16.0...v101.16.1) (2024-11-17)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([37c32df](https://github.com/dhis2/capture-app/commit/37c32df3e7839e30b493ff8e8185de769c3e2fd4))
+
+# [101.16.0](https://github.com/dhis2/capture-app/compare/v101.15.0...v101.16.0) (2024-11-13)
+
+
+### Features
+
+* [DHIS2-18250] Breadcrumb for event & enrollment pages ([#3849](https://github.com/dhis2/capture-app/issues/3849)) ([d65882e](https://github.com/dhis2/capture-app/commit/d65882eacb711865d9f6a860c65d56a0f4d68157))
+
+# [101.15.0](https://github.com/dhis2/capture-app/compare/v101.14.9...v101.15.0) (2024-11-12)
+
+
+### Features
+
+* [DHIS2-15187][DHIS2-15190] Working list bulk actions ([#3773](https://github.com/dhis2/capture-app/issues/3773)) ([5a12722](https://github.com/dhis2/capture-app/commit/5a127229e984b744fa3ea486d9b5a2632603bcd4))
+
+## [101.14.9](https://github.com/dhis2/capture-app/compare/v101.14.8...v101.14.9) (2024-11-10)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([00403fb](https://github.com/dhis2/capture-app/commit/00403fb596e08eba233fd4103c66c66f286a0881))
+
+## [101.14.8](https://github.com/dhis2/capture-app/compare/v101.14.7...v101.14.8) (2024-11-05)
+
+
+### Bug Fixes
+
+* [DHIS2-18278] remove completedAt and completedBy from the payload send to the API ([#3873](https://github.com/dhis2/capture-app/issues/3873)) ([156369a](https://github.com/dhis2/capture-app/commit/156369abe3dced63c773900acbc3f11f82d57723))
+
 ## [101.14.7](https://github.com/dhis2/capture-app/compare/v101.14.6...v101.14.7) (2024-11-04)
 
 

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature

@@ -50,7 +50,7 @@ Feature: User interacts with the Enrollment New Event Workspace
 
   Scenario: User should be asked to create new event after completing a stage and choose to cancel
     Given you land on the enrollment new event page by having typed #/enrollmentEventNew?enrollmentId=zRfAPUpjoG3&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=CWaAcQYKVpq&teiId=S3JjTA4QMNe
-    Then you see the following Enrollment: New Event
+    Then you see the new event form
     And you see the widget header Foci investigation & classification
     And you type 2022-01-01 in the input number 0
     And you type x in the input number 20
@@ -62,7 +62,7 @@ Feature: User interacts with the Enrollment New Event Workspace
 
   Scenario: User should be asked to create new event after completing a stage and choose to continue
     Given you land on the enrollment new event page by having typed #/enrollmentEventNew?enrollmentId=zRfAPUpjoG3&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=CWaAcQYKVpq&teiId=S3JjTA4QMNe
-    Then you see the following Enrollment: New Event
+    Then you see the new event form
     And you see the widget header Foci investigation & classification
     And you type 2022-01-01 in the input number 0
     And you type x in the input number 20
@@ -74,7 +74,7 @@ Feature: User interacts with the Enrollment New Event Workspace
 
   Scenario: User is able to schedule an event with a note
     Given you land on the enrollment new event page by having typed /#/enrollmentEventNew?enrollmentId=qcFFRp7DpcX&orgUnitId=DiszpKrYNg8&programId=WSGAb5XwJ3Y&stageId=edqlbukwRfQ&teiId=erqa3phUfpI
-    And you see the following Enrollment: New Event
+    And you see the new event form
     And you select the schedule tab
     When you add a note to the event
     And the events saves successfully

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js

@@ -11,7 +11,7 @@ const changeEnrollmentAndEventsStatus = () => (
             const enrollment = body.enrollments && body.enrollments.find(e => e.enrollment === 'FZAa7j0muDj');
             const eventToDelete = enrollment.events.find(e => e.programStage === 'eHvTba5ijAh');
             const { events, ...rest } = enrollment;
-            const enrollmentToUpdate = { ...rest, status: 'ACTIVE' };
+            const enrollmentToUpdate = { ...rest, status: 'ACTIVE', completedAt: null, completedBy: null };
 
             return cy
                 .buildApiUrl('tracker?async=false&importStrategy=UPDATE')

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageNavigation/EnrollmentAddEventPageNavigation.feature

@@ -1,7 +1,7 @@
 Feature: User interacts with Enrollment Add event page
   Scenario: The user can land on the enrollment add event page.
     Given you land on the enrollment add event page by having typed /#/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=tIJu6iqQxNV&enrollmentId=CCBLMntFuzb&stageId=A03MvHHogjR
-    Then you see the following Enrollment: New Event
+    Then you see the new event form
     And you see the widget header Birth
     And you see the following Report date
     And you see the add event form details

cypress/e2e/EnrollmentAddEventPage/sharedSteps.js

@@ -1,4 +1,4 @@
-import { Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 
 Then(/^you see the following (.*)$/, (message) => {
     cy.contains(message);
@@ -12,3 +12,7 @@ And(/^you see the widget header (.*)$/, (name) => {
             cy.contains(name).should('exist');
         });
 });
+
+When('you see the new event form', () => {
+    cy.get('[data-test="new-enrollment-event-form"]').should('exist');
+});

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature

@@ -25,12 +25,12 @@ And the user see the following text: Yes
 
 Scenario: The user can enter and exit the edit mode.
 Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?orgUnitId=DiszpKrYNg8&eventId=V1CerIi3sdL
-And the user see the following text: Enrollment: View Event
+And the view enrollment event form is in view mode
 And the user see the following text: Apgar Score
 When the user clicks on the edit button
-Then the user see the following text: Enrollment: Edit Event
+Then the view enrollment event form is in edit mode
 When the user clicks on the cancel button
-And the user see the following text: Enrollment: View Event
+And the view enrollment event form is in view mode
 
 Scenario: The tracker program rules are triggered correctly for the Child Program.
 Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?orgUnitId=DiszpKrYNg8&eventId=V1CerIi3sdL
@@ -53,58 +53,58 @@ Then the user don't see the following text: Low-dose acetylsalicylic acid given
 
 Scenario: User can modify and save the data in the form
 Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?orgUnitId=DiszpKrYNg8&eventId=V1CerIi3sdL
-Then the user see the following text: Enrollment: View Event
+Then the view enrollment event form is in view mode
 And the apgar score is 11
 When the user clicks on the edit button
 And the user set the apgar score to 5
 And the user clicks on the save button
 Then you are redirected to the enrollment dashboard
 And you open the Birth stage event
-Then the user see the following text: Enrollment: View Event
+Then the view enrollment event form is in view mode
 And the user see the following text: 5
 When the user clicks on the edit button
 And the user set the apgar score to 11
 And the user clicks on the save button
 Then you are redirected to the enrollment dashboard
 And you open the Birth stage event
-Then the user see the following text: Enrollment: View Event
+Then the view enrollment event form is in view mode
 And the user see the following text: 11
 
  Scenario: User goes directly to Edit mode for scheduled events
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=RIrfCcEP8Uu&orgUnitId=DiszpKrYNg8
-    Then the user see the following text: Enrollment: Edit Event
+    Then the view enrollment event form is in edit mode
     And the user see the following text: Infant Feeding
     When the user clicks on the cancel button
-    Then the user see the following text: Enrollment Dashboard
+    Then the user is navigated to the enrollment dashboard
 
-Scenario: User can update schedule date for a scheduled event 
+Scenario: User can update schedule date for a scheduled event
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=RIrfCcEP8Uu&orgUnitId=DiszpKrYNg8
-    Then the user see the following text: Enrollment: Edit Event
+    Then the view enrollment event form is in edit mode
     And the user see the following text: Infant Feeding
     When the user clicks switch tab to Schedule
     And the user selects another schedule date
     And the user clicks on the schedule button on widget-enrollment-event
-    Then the user see the following text: Enrollment Dashboard
+    Then the user is navigated to the enrollment dashboard
 
 Scenario: User can update schedule date if Hide due date is enabled
     Given you land on the enrollment event page with selected Focus area by having typed /#/enrollmentEventNew?enrollmentId=V8uPJuhvlL7&orgUnitId=DiszpKrYNg8&programId=M3xtLkYBlKI&stageId=uvMKOn1oWvd&tab=SCHEDULE&teiId=dNpxRu1mWG5
-    Then the user see the following text: Enrollment: New Event
+    Then the add event form is displayed
     And the user see the following text: Foci response
     And the user see the schedule date and info box
     And the user clicks on the schedule button on add-event-enrollment-page-content
-    Then the user see the following text: Enrollment Dashboard
+    Then the user is navigated to the enrollment dashboard
 
 Scenario: User can see disabled scheduled date for active event
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=FV4JCI73wO2&orgUnitId=DiszpKrYNg8
-    Then the user see the following text: Enrollment: View Event 
+    Then the view enrollment event form is in view mode
     When the user clicks on the edit button
-    Then the user see the following text: Enrollment: Edit Event
+    Then the view enrollment event form is in edit mode
     Then the user see the schedule date field with tooltip: Scheduled date cannot be changed for Active events
-    
+
 @user:trackerAutoTestRestricted
 Scenario: The user cannot enter edit mode for completed events
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=nUVwTLuQ6FT&orgUnitId=DiszpKrYNg8
-    And the user see the following text: Enrollment: View Event
+    And the view enrollment event form is in view mode
     Then the edit button should be disabled
 
 Scenario: User can edit the event and complete the enrollment
@@ -113,4 +113,4 @@ Scenario: User can edit the event and complete the enrollment
     And the user clicks on the edit button
     And the user completes the event
     And the user completes the enrollment
-    Then the user sees the enrollment status and recently edited event in Case outcome event status is completed
+    Then the user sees the enrollment status and recently edited event in Case outcome event status is completed

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js

@@ -1,4 +1,4 @@
-import { Given, When, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 import { getCurrentYear } from '../../../support/date';
 
 const changeEnrollmentAndEventsStatus = () => (
@@ -13,7 +13,9 @@ const changeEnrollmentAndEventsStatus = () => (
             const enrollmentToUpdate = {
                 ...enrollment,
                 status: 'ACTIVE',
-                events: [{ ...eventToUpdate, status: 'ACTIVE' }],
+                completedAt: null,
+                completedBy: null,
+                events: [{ ...eventToUpdate, status: 'ACTIVE', completedAt: null, completedBy: null }],
             };
 
             return cy
@@ -59,8 +61,7 @@ Given(/^you land on the enrollment event page with selected (.*) by having typed
 When(/^the user clicks on the edit button/, () =>
     cy
         .get('[data-test="widget-enrollment-event"]')
-        .find('[data-test="dhis2-uicore-button"]')
-        .eq(1)
+        .find('[data-test="widget-enrollment-event-edit-button"]')
         .click(),
 );
 
@@ -206,7 +207,18 @@ And('you open the Birth stage event', () => {
 
 Then('the edit button should be disabled', () => {
     cy.get('[data-test="widget-enrollment-event"]')
-        .find('[data-test="dhis2-uicore-button"]')
-        .eq(1)
+        .find('[data-test="widget-enrollment-event-edit-button"]')
         .should('be.disabled');
 });
+
+And('the add event form is displayed', () => {
+    cy.get('[data-test="add-event-enrollment-page-content"]').should('exist');
+});
+
+And('the user is navigated to the enrollment dashboard', () => {
+    cy.get('[data-test="enrollment-overview-page"]').should('exist');
+});
+
+And(/^the view enrollment event form is in (.*) mode$/, (mode) => {
+    cy.get(`[data-test="widget-enrollment-event-${mode}"]`).should('exist');
+});

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageNavigation/EnrollmentEditEventPageNavigation.feature

@@ -2,18 +2,18 @@ Feature: User interacts with Enrollment event page
 
   Scenario: The user can land on the enrollment event page.
     Given you land on the enrollment event page by having typed #/enrollmentEventEdit?orgUnitId=DiszpKrYNg8&eventId=O7IACPx40nQ
-    Then you see the following Enrollment: View Event
+    Then the view enrollment event form is in view mode
     And you see the following Baby Postnatal
 
-  Scenario: User can navigate back and forward between the enrollment event edit page and the enrollment page 
+  Scenario: User can navigate back and forward between the enrollment event edit page and the enrollment page
     Given you open the enrollment page which has multiple events and stages
-    Then you see the following Enrollment Dashboard
+    Then the user is navigated to the enrollment dashboard
     And the widgets are done rendering
     And the program stages should be displayed
     When the user clicks the first second antenatal care visit event
-    Then you see the following Enrollment: View Event
+    Then the view enrollment event form is in view mode
     And you see the following antenatal care visit
     And you see the following No ARV medication plan
     When the user clicks the "Back to all stages and events" button
-    Then you see the following Enrollment Dashboard
-    And the program stages should be displayed
+    Then the user is navigated to the enrollment dashboard
+    And the program stages should be displayed

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageNavigation/EnrollmentEditEventPageNavigation.js

@@ -1,4 +1,4 @@
-import { Given, When, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 
 Given(/^you land on the enrollment event page by having typed (.*)$/, (url) => {
     cy.visit(url);
@@ -21,10 +21,7 @@ When('the user clicks the first second antenatal care visit event', () => {
 });
 
 When(/^the user clicks the "Back to all stages and events" button/, () =>
-    cy
-        .get('[data-test="widget-enrollment-event"]')
-        .find('[data-test="dhis2-uicore-button"]')
-        .eq(0)
+    cy.get('[data-test="enrollment-edit-event-back-button"]')
         .click(),
 );
 
@@ -39,3 +36,11 @@ Then('the program stages should be displayed', () => {
             cy.contains('Care at birth').should('exist');
         });
 });
+
+And('the user is navigated to the enrollment dashboard', () => {
+    cy.get('[data-test="enrollment-overview-page"]').should('exist');
+});
+
+And(/^the view enrollment event form is in (.*) mode$/, (mode) => {
+    cy.get(`[data-test="widget-enrollment-event-${mode}"]`).should('exist');
+});

cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/EnrollmentPageNavigation.js

@@ -1,9 +1,8 @@
-import { Given, When, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 
 Given('you are on an enrollment page', () => {
     cy.visit('/#/enrollment?programId=IpHINAT79UW&orgUnitId=UgYg0YW7ZIh&teiId=fhFQhO0xILJ&enrollmentId=gPDueU02tn8');
-    cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enrollment Dashboard');
+    cy.get('[data-test="enrollment-overview-page"]');
 });
 
 And('you select the Inpatient morbidity program', () => {
@@ -90,8 +89,7 @@ Then(/^you should be redirect to (.*)$/, (expectedUrl) => {
 
 Given('you land on the enrollment page by having typed only the enrollmentId in the url', () => {
     cy.visit('/#/enrollment?enrollmentId=gPDueU02tn8');
-    cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enrollment Dashboard');
+    cy.get('[data-test="enrollment-overview-page"]');
     cy.contains('[data-test="scope-selector"]', 'Carlos Cruz');
     cy.contains('[data-test="scope-selector"]', 'Taninahun (Malen) CHP');
     cy.contains('1 event');
@@ -119,8 +117,7 @@ When('you reset the org unit selection', () => {
 
 Then('you see the enrollment page but there is no org unit id in the url', () => {
     cy.url().should('not.include', 'orgUnitId');
-    cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enrollment Dashboard');
+    cy.get('[data-test="enrollment-overview-page"]');
 });
 
 When('you reset the enrollment selection', () => {

cypress/e2e/EnrollmentPage/EnrollmentQuickActions/EnrollmentQuickActions.js

@@ -1,19 +1,17 @@
-import { Given, When, Then } from '@badeball/cypress-cucumber-preprocessor';
+import { Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 
 Given(/^you open the enrollment page by typing (.*)$/, url =>
     cy.visit(url),
 );
 
 Given('you are on an enrollment page with stage available', () => {
     cy.visit('/#/enrollment?programId=ur1Edk5Oe2n&orgUnitId=UgYg0YW7ZIh&teiId=zmgVvEZ91Kg&enrollmentId=xRnBV5aJDeF');
-    cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enrollment Dashboard');
+    cy.get('[data-test="enrollment-overview-page"]');
 });
 
 Given('you are on an enrollment page with no stage available', () => {
     cy.visit('/#/enrollment?programId=IpHINAT79UW&orgUnitId=UgYg0YW7ZIh&teiId=fhFQhO0xILJ&enrollmentId=gPDueU02tn8');
-    cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enrollment Dashboard');
+    cy.get('[data-test="enrollment-overview-page"]');
 });
 
 When(/^you click the (.*) event-button/, (mode) => {

cypress/e2e/EnrollmentPage/sharedSteps.js

@@ -7,3 +7,7 @@ Given('you open the enrollment page', () => {
 Given('you open the enrollment page which has multiples events and stages', () => {
     cy.visit('#/enrollment?enrollmentId=ek4WWAgXX5i');
 });
+
+Given('you are on the enrollment dashboard', () => {
+    cy.url().should('include', '/#/enrollment?');
+});