Merge branch 'master' into hv/feat/DHIS2-18328_GeometryScheduledAtAnd…

…OccuredAtInChangelog

.github/workflows/dhis2-verify-commits.yml

@@ -6,6 +6,7 @@ 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
@@ -18,6 +19,7 @@ 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

CHANGELOG.md

@@ -1,3 +1,73 @@
+## [101.20.3](https://github.com/dhis2/capture-app/compare/v101.20.2...v101.20.3) (2024-12-29)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([f58bcd3](https://github.com/dhis2/capture-app/commit/f58bcd3c62d45101bbb4d5b16f504f1699cbb3d4))
+
+## [101.20.2](https://github.com/dhis2/capture-app/compare/v101.20.1...v101.20.2) (2024-12-22)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([a463047](https://github.com/dhis2/capture-app/commit/a4630471d77804436c8803daed4bd05e5c61f2c7))
+
+## [101.20.1](https://github.com/dhis2/capture-app/compare/v101.20.0...v101.20.1) (2024-12-19)
+
+
+### Bug Fixes
+
+* [DHIS2-118654] Use importStrategy=DELETE to support older backend ([#3914](https://github.com/dhis2/capture-app/issues/3914)) ([eb5325e](https://github.com/dhis2/capture-app/commit/eb5325e71087c0e00011878bd58f2fef3ad55eea))
+
+# [101.20.0](https://github.com/dhis2/capture-app/compare/v101.19.4...v101.20.0) (2024-12-17)
+
+
+### Features
+
+* [DHIS2-18017] Ability to unlink event from edit/view event page ([#3846](https://github.com/dhis2/capture-app/issues/3846)) ([ad352f5](https://github.com/dhis2/capture-app/commit/ad352f5845a8780668ecf5659100f650c697d426))
+
+## [101.19.4](https://github.com/dhis2/capture-app/compare/v101.19.3...v101.19.4) (2024-12-15)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([ef97375](https://github.com/dhis2/capture-app/commit/ef973753e9014541c22215ea0690fecb819c82e3))
+
+## [101.19.3](https://github.com/dhis2/capture-app/compare/v101.19.2...v101.19.3) (2024-12-13)
+
+
+### Bug Fixes
+
+* [DHIS2-18614] prevent runtime error when only one date range is selected ([#3906](https://github.com/dhis2/capture-app/issues/3906)) ([4699a84](https://github.com/dhis2/capture-app/commit/4699a84b138a17bc42fae5be6685a71b840c1a43))
+
+## [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)
 
 

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature

@@ -21,9 +21,9 @@ Feature: User interacts with the Enrollment New Event Workspace
     And the user selects Positive
     And you click the Save without completing button
     Then all events should be displayed
-    And the newest event in datatable nr 1 should contain Active
-    And the newest event in datatable nr 1 should contain 13
-    And the newest event in datatable nr 1 should contain Positive
+    And the newest event in datatable nr 2 should contain Active
+    And the newest event in datatable nr 2 should contain 13
+    And the newest event in datatable nr 2 should contain Positive
     And the events in Sputum smear microscopy are deleted
 
   Scenario: Required fields should display an error when saving without data

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('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .eq(eq)
         .type(value)
         .blur();
@@ -132,7 +132,7 @@ Then('all events should be displayed', () => {
 });
 
 Then(/^the newest event in datatable nr (.*) should contain (.*)$/, (eq, status) => {
-    cy.get('[data-test="dhis2-uicore-datatable"]')
+    cy.get('[data-test="stage-content"]')
         .eq(eq)
         .within(() => {
             cy.get('[data-test="dhis2-uicore-datatablerow"]')
@@ -155,7 +155,7 @@ When(/^the user selects (.*)$/, (value) => {
 });
 
 When(/^you focus and blur a required field/, () => {
-    cy.get('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .eq(1)
         .focus()
         .blur();

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature

@@ -77,6 +77,7 @@ And the user see the following text: 11
     When the user clicks on the cancel button
     Then the user is navigated to the enrollment dashboard
 
+@with-restore-event-schedule-date
 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 view enrollment event form is in edit mode

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js

@@ -1,6 +1,18 @@
-import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When, Before } from '@badeball/cypress-cucumber-preprocessor';
 import { getCurrentYear } from '../../../support/date';
 
+Before({ tags: '@with-restore-event-schedule-date' }, () => {
+    cy.buildApiUrl('tracker', 'events/RIrfCcEP8Uu')
+        .then(url => cy.request(url))
+        .then((apiResponse) => {
+            const event = apiResponse.body;
+            const eventToUpdate = { ...event, scheduledAt: `${getCurrentYear() - 15}-01-07` };
+            return cy
+                .buildApiUrl('tracker?async=false&importStrategy=UPDATE')
+                .then(eventUrl => cy.request('POST', eventUrl, { events: [eventToUpdate] }));
+        });
+});
+
 const changeEnrollmentAndEventsStatus = () => (
     cy.buildApiUrl(
         'tracker',
@@ -84,7 +96,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('[data-test="capture-ui-input"]')
+        .find('input[type="text"]')
         .eq(2)
         .clear()
         .type(score)
@@ -118,8 +130,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("[data-test='capture-ui-input']").eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`);
-        cy.get("[data-test='capture-ui-input']").eq(0)
+        cy.get('input[type="text"]').eq(0).should('have.value', `${getCurrentYear() - 15}-01-07`);
+        cy.get('input[type="text"]').eq(0)
             .clear()
             .type(`${getCurrentYear()}-08-01`)
             .blur();

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('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .eq(1)
         .type('1999-09-01')
         .blur();
     cy.get('[data-test="d2-section"]')
-        .find('[data-test="capture-ui-input"]')
+        .find('input[type="text"]')
         .eq(0)
         .type('Breaking')
         .blur();
     cy.get('[data-test="d2-section"]')
-        .find('[data-test="capture-ui-input"]')
+        .find('input[type="text"]')
         .eq(1)
         .type('TheGlass')
         .blur();
-    cy.get('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .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('[data-test="capture-ui-input"]')
+        .find('input[type="text"]')
         .eq(8)
         .type('1999-09-01')
         .blur();

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('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .eq(0)
         .type(moment().format('YYYY-MM-DD'))
         .blur();

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('[data-test="capture-ui-input"]')
+    cy.get('input[type="text"]')
         .first()
         .type('2023-01-26')
         .blur();