Revert "Merge remote-tracking branch 'origin/master' into hv/feat/DHI…

…S2-18325_showOrgUnitSelectorInNewEventForm" This reverts commit 3ee7546.
dhis2 · Dec 9, 2024 · 7f6d2eb · 7f6d2eb
1 parent 3ee7546
commit 7f6d2eb
Show file tree

Hide file tree

Showing 197 changed files with 6,481 additions and 12,970 deletions.
diff --git a/.github/workflows/dhis2-verify-commits.yml b/.github/workflows/dhis2-verify-commits.yml
@@ -6,7 +6,6 @@ on:
 
 jobs:
     lint-pr-title:
-        if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'dhis2-bot'
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
@@ -19,7 +18,6 @@ jobs:
                   configuration-path: ${{ steps.commitlint.outputs.config_path }}
 
     lint-commits:
-        if: github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'dhis2-bot'
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,81 +1,3 @@
-## [101.19.2](https://github.com/dhis2/capture-app/compare/v101.19.1...v101.19.2) (2024-12-08)
-
-
-### Bug Fixes
-
-* **translations:** sync translations from transifex (master) ([0ddef74](https://github.com/dhis2/capture-app/commit/0ddef746e773ab6ede7b2e297cb169b5887ad446))
-
-## [101.19.1](https://github.com/dhis2/capture-app/compare/v101.19.0...v101.19.1) (2024-12-05)
-
-
-### Bug Fixes
-
-* [DHIS2-17854] validate the assigned values from rules engine ([#3783](https://github.com/dhis2/capture-app/issues/3783)) ([db9d6b8](https://github.com/dhis2/capture-app/commit/db9d6b8f23fb29af30ef61fb3649c167073a46ff))
-
-# [101.19.0](https://github.com/dhis2/capture-app/compare/v101.18.1...v101.19.0) (2024-12-03)
-
-
-### Features
-
-* [DHIS2-15462] Use dhis2 UI calendarinput component in forms ([#3658](https://github.com/dhis2/capture-app/issues/3658)) ([f39fd47](https://github.com/dhis2/capture-app/commit/f39fd471cb2f176a417667481b17a72b2d4651dd))
-
-## [101.18.1](https://github.com/dhis2/capture-app/compare/v101.18.0...v101.18.1) (2024-12-03)
-
-
-### Bug Fixes
-
-* **translations:** sync translations from transifex (master) ([a2d43b2](https://github.com/dhis2/capture-app/commit/a2d43b2db7b926066a438d6f5f42ad19d37987fe))
-
-# [101.18.0](https://github.com/dhis2/capture-app/compare/v101.17.0...v101.18.0) (2024-11-28)
-
-
-### Features
-
-* [DHIS2-16337] Org unit in view event page ([#3882](https://github.com/dhis2/capture-app/issues/3882)) ([c605e82](https://github.com/dhis2/capture-app/commit/c605e828622aa9f9b0c10f96359ba1b037c8e0ee))
-
-# [101.17.0](https://github.com/dhis2/capture-app/compare/v101.16.7...v101.17.0) (2024-11-25)
-
-
-### Features
-
-* [DHIS2-15463] Use dhis2 ui calendarInput component in working list ([#3712](https://github.com/dhis2/capture-app/issues/3712)) ([5f27455](https://github.com/dhis2/capture-app/commit/5f27455b136d6d994adea0788bf2d0683dfe5d06))
-
-## [101.16.7](https://github.com/dhis2/capture-app/compare/v101.16.6...v101.16.7) (2024-11-25)
-
-
-### Bug Fixes
-
-* [DHIS2-16801] events scheduled for today's date not showing today ([#3856](https://github.com/dhis2/capture-app/issues/3856)) ([d63e124](https://github.com/dhis2/capture-app/commit/d63e124d1c0702898b453be8cfbdd0a5f4620ba5))
-
-## [101.16.6](https://github.com/dhis2/capture-app/compare/v101.16.5...v101.16.6) (2024-11-25)
-
-
-### Bug Fixes
-
-* [DHIS2-17519] app crashing when opening new event from view event ([#3781](https://github.com/dhis2/capture-app/issues/3781)) ([93366ef](https://github.com/dhis2/capture-app/commit/93366ef504210cc9aa746f7d10a4cc7d6188586d))
-* [DHIS2-18150] user has to click out of range filter for update button to trigger ([#3855](https://github.com/dhis2/capture-app/issues/3855)) ([f70b205](https://github.com/dhis2/capture-app/commit/f70b2053f753388e994c89698677821fd8032f79))
-
-## [101.16.5](https://github.com/dhis2/capture-app/compare/v101.16.4...v101.16.5) (2024-11-24)
-
-
-### Bug Fixes
-
-* **translations:** sync translations from transifex (master) ([3098faf](https://github.com/dhis2/capture-app/commit/3098faf8b73dbfc0d894535cbdfd5539e80a24fe))
-
-## [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)
 
 

diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js
@@ -89,7 +89,7 @@ When(/^you click the create new button number (.*)$/, (eq) => {
 });
 
 When(/^you type (.*) in the input number (.*)$/, (value, eq) => {
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .eq(eq)
         .type(value)
         .blur();
@@ -155,7 +155,7 @@ When(/^the user selects (.*)$/, (value) => {
 });
 
 When(/^you focus and blur a required field/, () => {
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .eq(1)
         .focus()
         .blur();

diff --git a/...ss/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/...ss/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -61,7 +61,8 @@ 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="widget-enrollment-event-edit-button"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(1)
         .click(),
 );
 
@@ -84,7 +85,7 @@ When(/^the user clicks on the cancel button/, () =>
 When(/^the user set the apgar score to (.*)/, score =>
     cy
         .get('[data-test="widget-enrollment-event"]')
-        .find('input[type="text"]')
+        .find('[data-test="capture-ui-input"]')
         .eq(2)
         .clear()
         .type(score)
@@ -118,8 +119,8 @@ When('the user clicks switch tab to Schedule', () => {
 
 Then('the user selects another schedule date', () => {
     cy.get('[data-test="schedule-section"]').within(() => {
-        cy.get('input[type="text"]').eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`);
-        cy.get('input[type="text"]').eq(0)
+        cy.get("[data-test='capture-ui-input']").eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`);
+        cy.get("[data-test='capture-ui-input']").eq(0)
             .clear()
             .type(`${getCurrentYear()}-08-01`)
             .blur();
@@ -207,7 +208,8 @@ And('you open the Birth stage event', () => {
 
 Then('the edit button should be disabled', () => {
     cy.get('[data-test="widget-enrollment-event"]')
-        .find('[data-test="widget-enrollment-event-edit-button"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(1)
         .should('be.disabled');
 });
 

diff --git a/...lmentEditEventPage/EnrollmentEditEventPageNavigation/EnrollmentEditEventPageNavigation.js b/...lmentEditEventPage/EnrollmentEditEventPageNavigation/EnrollmentEditEventPageNavigation.js
@@ -21,7 +21,10 @@ 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="enrollment-edit-event-back-button"]')
+    cy
+        .get('[data-test="widget-enrollment-event"]')
+        .find('[data-test="dhis2-uicore-button"]')
+        .eq(0)
         .click(),
 );
 

diff --git a/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js b/cypress/e2e/EnrollmentPage/BreakingTheGlass/BreakingTheGlass.js
@@ -16,21 +16,21 @@ Given('the tei created by this test is cleared from the database', () => {
 
 And('you create a new tei in Child programme from Ngelehun CHC', () => {
     cy.visit('/#/new?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW');
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .eq(1)
         .type('1999-09-01')
         .blur();
     cy.get('[data-test="d2-section"]')
-        .find('input[type="text"]')
+        .find('[data-test="capture-ui-input"]')
         .eq(0)
         .type('Breaking')
         .blur();
     cy.get('[data-test="d2-section"]')
-        .find('input[type="text"]')
+        .find('[data-test="capture-ui-input"]')
         .eq(1)
         .type('TheGlass')
         .blur();
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .eq(7)
         .type('2023-09-01')
         .blur();
@@ -68,7 +68,7 @@ And('you enroll the tei from Njandama MCHP', () => {
         .click();
 
     cy.get('[data-test="d2-section"]')
-        .find('input[type="text"]')
+        .find('[data-test="capture-ui-input"]')
         .eq(8)
         .type('1999-09-01')
         .blur();

diff --git a/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js b/cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js
@@ -28,7 +28,7 @@ Given('you add an enrollment event that will result in a rule effect to hide a p
         '/#/enrollmentEventNew?enrollmentId=fmhIsWXVDmS&orgUnitId=s7SLtx8wmRA&programId=WSGAb5XwJ3Y&stageId=PFDfvmGpsR3&teiId=uW8Y7AIcRKA',
     );
 
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .eq(0)
         .type(moment().format('YYYY-MM-DD'))
         .blur();

diff --git a/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js b/cypress/e2e/EnrollmentPage/StagesAndEventsWidget/StagesAndEventsWidget.js
@@ -11,7 +11,7 @@ After({ tags: '@with-restore-deleted-event' }, () => {
         .find('[data-test="create-new-button"]')
         .click();
 
-    cy.get('input[type="text"]')
+    cy.get('[data-test="capture-ui-input"]')
         .first()
         .type('2023-01-26')
         .blur();