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

…_ViewRelationships # 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
dhis2 · Jul 25, 2023 · cc9de1b · cc9de1b
2 parents 5c49e06 + 5eefb06
commit cc9de1b
Show file tree

Hide file tree

Showing 356 changed files with 15,597 additions and 10,870 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -29,7 +29,7 @@ env:
     BASE_URL_INSTANCES: ${{ secrets.CYPRESS_DHIS2_INSTANCES_BASE_URL }}
     NAME_PATTERN_LEGACY_INSTANCES: ca-test-{version}
     NAME_PATTERN_DEV_INSTANCE: ca-test-dev
-    CYPRESS_CONTAINERS: 8
+    CYPRESS_CONTAINERS: 5
     TRIGGER_LABELS: e2e-tests, testing
 
 defaults:

diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml
@@ -95,7 +95,7 @@ jobs:
   instance-version:
     runs-on: ubuntu-latest
     needs: [lint, flow, unit-tests]
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: "!(startsWith(github.event.head_commit.message, 'fix(translations)') && github.actor == 'dhis2-bot') && !contains(github.event.head_commit.message, '[skip ci]')"
     outputs:
       version: ${{ steps.instance-version.outputs.version }}
     steps:
@@ -109,7 +109,6 @@ jobs:
   cypress-dev:
     runs-on: ubuntu-latest
     needs: instance-version
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container: cypress/browsers:node14.7.0-chrome84
     strategy:
       # when one test fails, DO NOT cancel the other
@@ -118,7 +117,7 @@ jobs:
       # https://github.com/cypress-io/github-action/issues/48
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6, 7, 8]
+        containers: [1, 2, 3, 4, 5]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,206 @@
+## [100.35.1](https://github.com/dhis2/capture-app/compare/v100.35.0...v100.35.1) (2023-07-25)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([fa0dfb0](https://github.com/dhis2/capture-app/commit/fa0dfb013c0ef4415b5fed1e38ab576124c87b4c))
+
+# [100.35.0](https://github.com/dhis2/capture-app/compare/v100.34.1...v100.35.0) (2023-07-24)
+
+
+### Features
+
+* [DHIS2-14775][DHIS2-14729] Render data entry plugins ([80a218e](https://github.com/dhis2/capture-app/commit/80a218e2dea3f4b25694b25e491dac20a310b8bb))
+
+## [100.34.1](https://github.com/dhis2/capture-app/compare/v100.34.0...v100.34.1) (2023-07-12)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([6edf2e8](https://github.com/dhis2/capture-app/commit/6edf2e86370a1e51460282760836c9271aceb123))
+
+# [100.34.0](https://github.com/dhis2/capture-app/compare/v100.33.5...v100.34.0) (2023-07-11)
+
+
+### Features
+
+* [DHIS2-14778][DHIS2-14779][DHIS2-14780][DHIS2-14781] MULTI_TEXT field ([#3231](https://github.com/dhis2/capture-app/issues/3231)) ([d7b7100](https://github.com/dhis2/capture-app/commit/d7b7100cadfa4d3f3c1a162161f34dc7df2833e8))
+
+## [100.33.5](https://github.com/dhis2/capture-app/compare/v100.33.4...v100.33.5) (2023-07-08)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([5a252ff](https://github.com/dhis2/capture-app/commit/5a252ff89fed79ddbbb6b3a8420fadcae1d9dadd))
+
+## [100.33.4](https://github.com/dhis2/capture-app/compare/v100.33.3...v100.33.4) (2023-07-07)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([446c1fe](https://github.com/dhis2/capture-app/commit/446c1fedd79cc8a816680c2a066d0dd13cf4cd27))
+
+## [100.33.3](https://github.com/dhis2/capture-app/compare/v100.33.2...v100.33.3) (2023-07-06)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([5648b98](https://github.com/dhis2/capture-app/commit/5648b98b251008a2202ce596f12d8c57e17b914d))
+
+## [100.33.2](https://github.com/dhis2/capture-app/compare/v100.33.1...v100.33.2) (2023-07-05)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([6d24a67](https://github.com/dhis2/capture-app/commit/6d24a67df569d60ee451474f9c8f45836459ca03))
+
+## [100.33.1](https://github.com/dhis2/capture-app/compare/v100.33.0...v100.33.1) (2023-07-04)
+
+
+### Bug Fixes
+
+* [DHIS2-15312] AOC for event programs ([#3293](https://github.com/dhis2/capture-app/issues/3293)) ([ed1983c](https://github.com/dhis2/capture-app/commit/ed1983c50ba99a72a92d70af7d4fd52e9264c99d))
+
+# [100.33.0](https://github.com/dhis2/capture-app/compare/v100.32.16...v100.33.0) (2023-06-27)
+
+
+### Features
+
+* [DHIS2-5437] change wording for discard modal ([#3157](https://github.com/dhis2/capture-app/issues/3157)) ([74604fe](https://github.com/dhis2/capture-app/commit/74604fe2b57d1353b02d52ac78f704d71216985c))
+
+## [100.32.16](https://github.com/dhis2/capture-app/compare/v100.32.15...v100.32.16) (2023-06-27)
+
+
+### Bug Fixes
+
+* [DHIS2-14484] show notice when fields are about to be blank out by a program rule ([#3185](https://github.com/dhis2/capture-app/issues/3185)) ([747a8ea](https://github.com/dhis2/capture-app/commit/747a8ea1a395d1ca673f9bf37de0ff11da46610c))
+
+## [100.32.15](https://github.com/dhis2/capture-app/compare/v100.32.14...v100.32.15) (2023-06-19)
+
+
+### Bug Fixes
+
+* [DHIS2-15426] ui design changes ([#3179](https://github.com/dhis2/capture-app/issues/3179)) ([557f18b](https://github.com/dhis2/capture-app/commit/557f18b35734bc0918e2a61e2f1bb70bfeef63fc))
+
+## [100.32.14](https://github.com/dhis2/capture-app/compare/v100.32.13...v100.32.14) (2023-06-19)
+
+
+### Bug Fixes
+
+* [DHIS2-15127] insert correct orgunit group object ([#3270](https://github.com/dhis2/capture-app/issues/3270)) ([14dbbe0](https://github.com/dhis2/capture-app/commit/14dbbe040785c1b0c3cbd51f3af9062a7b089137))
+
+## [100.32.13](https://github.com/dhis2/capture-app/compare/v100.32.12...v100.32.13) (2023-06-18)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([fb242e6](https://github.com/dhis2/capture-app/commit/fb242e60ec1c4546a31665d7a76403a109279248))
+
+## [100.32.12](https://github.com/dhis2/capture-app/compare/v100.32.11...v100.32.12) (2023-06-16)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([d14ad97](https://github.com/dhis2/capture-app/commit/d14ad97ea0988b40a9dfa5db60eb50e38262a68f))
+
+## [100.32.11](https://github.com/dhis2/capture-app/compare/v100.32.10...v100.32.11) (2023-06-15)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([df36162](https://github.com/dhis2/capture-app/commit/df36162600b3c0e66b6dbb421a2bc9b2a6fe08f6))
+
+## [100.32.10](https://github.com/dhis2/capture-app/compare/v100.32.9...v100.32.10) (2023-06-10)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e79ebf0](https://github.com/dhis2/capture-app/commit/e79ebf0f439cc1a148fa98b433d8494cbeadc87d))
+
+## [100.32.9](https://github.com/dhis2/capture-app/compare/v100.32.8...v100.32.9) (2023-06-09)
+
+
+### Bug Fixes
+
+* updating saving text ([#3251](https://github.com/dhis2/capture-app/issues/3251)) ([12439b6](https://github.com/dhis2/capture-app/commit/12439b6e635d8967f2cff550cfbb144c0d44b3a7))
+
+## [100.32.8](https://github.com/dhis2/capture-app/compare/v100.32.7...v100.32.8) (2023-06-08)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e47a90a](https://github.com/dhis2/capture-app/commit/e47a90a56957c9adcf6c3a0c177cef09b81eecc6))
+
+## [100.32.7](https://github.com/dhis2/capture-app/compare/v100.32.6...v100.32.7) (2023-06-07)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e252444](https://github.com/dhis2/capture-app/commit/e252444524c71e41bf2967ae1c2d2738c2af750d))
+
+## [100.32.6](https://github.com/dhis2/capture-app/compare/v100.32.5...v100.32.6) (2023-06-05)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([b46d1cf](https://github.com/dhis2/capture-app/commit/b46d1cf6cc97452b78b708e41ffe689fe1eab5af))
+
+## [100.32.5](https://github.com/dhis2/capture-app/compare/v100.32.4...v100.32.5) (2023-06-02)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e00489c](https://github.com/dhis2/capture-app/commit/e00489c2f216e8f0ace13655a8b810fd281bc7cf))
+
+## [100.32.4](https://github.com/dhis2/capture-app/compare/v100.32.3...v100.32.4) (2023-06-01)
+
+
+### Bug Fixes
+
+* [DHIS2-14412] validate date-string arguments in d2-functions ([#3236](https://github.com/dhis2/capture-app/issues/3236)) ([cab376e](https://github.com/dhis2/capture-app/commit/cab376e7fbf76de17a6b8dfdbda23b8ed680e006))
+
+## [100.32.3](https://github.com/dhis2/capture-app/compare/v100.32.2...v100.32.3) (2023-06-01)
+
+
+### Bug Fixes
+
+* [DHIS2-15231] Information widgets wrongly hidden in Add Event Page ([4adea95](https://github.com/dhis2/capture-app/commit/4adea952b60f78953091aca011813885a24d7407))
+
+## [100.32.2](https://github.com/dhis2/capture-app/compare/v100.32.1...v100.32.2) (2023-06-01)
+
+
+### Bug Fixes
+
+* [DHIS2-15342] program stage WL trackedEntities request ([#3269](https://github.com/dhis2/capture-app/issues/3269)) ([2a50baf](https://github.com/dhis2/capture-app/commit/2a50baf6a2015d22a0c66fd50027dfe98191fe98))
+
+## [100.32.1](https://github.com/dhis2/capture-app/compare/v100.32.0...v100.32.1) (2023-05-30)
+
+
+### Bug Fixes
+
+* [DHIS2-12520] change enrollment event from url ([#3210](https://github.com/dhis2/capture-app/issues/3210)) ([c126fe4](https://github.com/dhis2/capture-app/commit/c126fe479bc04c5cbacfe309b8400782f2727be4))
+
+# [100.32.0](https://github.com/dhis2/capture-app/compare/v100.31.7...v100.32.0) (2023-05-30)
+
+
+### Features
+
+* [DHIS2-14577] search UX improvements ([#3229](https://github.com/dhis2/capture-app/issues/3229)) ([967ba52](https://github.com/dhis2/capture-app/commit/967ba5273df26ca1cc0e5276f7682da479548121))
+
+## [100.31.7](https://github.com/dhis2/capture-app/compare/v100.31.6...v100.31.7) (2023-05-29)
+
+
+### Bug Fixes
+
+* [DHIS2-15153] ask user to create new event  ([#3248](https://github.com/dhis2/capture-app/issues/3248)) ([d061efc](https://github.com/dhis2/capture-app/commit/d061efca2bbc5c4ecf3b8b1614e0ccb7a7d909d3))
+
+## [100.31.6](https://github.com/dhis2/capture-app/compare/v100.31.5...v100.31.6) (2023-05-29)
+
+
+### Bug Fixes
+
+* [TECH-1508][DHIS2-15103] extract search component ([#3223](https://github.com/dhis2/capture-app/issues/3223)) ([dd72c50](https://github.com/dhis2/capture-app/commit/dd72c5053a8aea8620e51fd80260654d6a6815ed))
+
 ## [100.31.5](https://github.com/dhis2/capture-app/compare/v100.31.4...v100.31.5) (2023-05-25)
 
 

diff --git a/cypress/integration/EnrollmentAddEventPage/EnrollmentAddEventPageForm/index.js b/cypress/integration/EnrollmentAddEventPage/EnrollmentAddEventPageForm/index.js
@@ -133,12 +133,12 @@ Then(/^the input should throw an error with error-message (.*)$/, (error) => {
 
 
 Then('there should be a modal popping up', () => {
-    cy.contains('[data-test="dhis2-uicore-modal"]', 'Generate new event')
+    cy.contains('[data-test="modal-ask-to-create-new"]', 'Generate new event')
         .should('exist');
 });
 
 When(/^you choose option (.*) in the modal$/, (buttonText) => {
-    cy.get('[data-test="dhis2-uicore-modal"]')
+    cy.get('[data-test="modal-ask-to-create-new"]')
         .find('[data-test="dhis2-uicore-button"]')
         .contains(buttonText)
         .click();

diff --git a/cypress/integration/NewPage.feature b/cypress/integration/NewPage.feature
@@ -166,6 +166,15 @@ Feature: User creates a new entries from the registration page
     When you submit the form again from the duplicates modal
     Then you are navigated to the WHO RMNCH program in Tracker Capture app
 
+@v>=41
+  Scenario: New person in Tracker Program > Filling the Allergies with multiple options
+    Given you are in the WHO RMNCH program registration page
+    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
+
   Scenario: New person in Tracker Program > Submitting the form shows a list with duplicates
     Given you are in Child programme registration page
     When you fill the Child programme registration form with a first name with value that has duplicates

diff --git a/cypress/integration/NewPage/index.js b/cypress/integration/NewPage/index.js
@@ -368,11 +368,11 @@ Then('you should see confirm dialog', () => {
     cy.get('[data-test="dhis2-uicore-layer"].translucent').within(() => {
         cy.get('[role="dialog"]')
             .find('[data-test="dhis2-uicore-modaltitle"]')
-            .contains('Unsaved changes')
+            .contains('Discard unsaved changes?')
             .should('exist');
         cy.get('[role="dialog"]')
             .find('[data-test="dhis2-uicore-button"]')
-            .contains('Yes, discard')
+            .contains('Yes, discard changes')
             .click();
     });
 });
@@ -565,3 +565,23 @@ Then('you see the enrollment event New page', () => {
     cy.url().should('include', '/#/enrollmentEventNew?');
     cy.url().should('include', 'stageId=hYyB7FUS5eR');
 });
+
+
+And('you fill in multiple Allergies options', () => {
+    cy.get('[data-test="registration-page-content"]').within(() => {
+        cy.contains('Allergies').should('exist');
+    });
+    cy.get('[data-test="dhis2-uicore-select-input"]').click();
+    cy.get('[data-test="dhis2-uicore-multiselectoption"]').contains('Penicillin and related antibiotics').click();
+    cy.get('[data-test="dhis2-uicore-multiselectoption"]').contains('Anticonvulsants').click();
+    cy.get('[data-test="dhis2-uicore-multiselectoption"]').contains('Other').click();
+    cy.get('[data-test="dhis2-uicore-select-input"]').click({ force: true });
+});
+
+Then('you can see the multiple selections in the form', () => {
+    cy.get('[data-test="multi-select-field-content"]').within(() => {
+        cy.contains('Penicillin and related antibiotics').should('exist');
+        cy.contains('Anticonvulsants').should('exist');
+        cy.contains('Other').should('exist');
+    });
+});
diff --git a/cypress/integration/SearchPage/index.js b/cypress/integration/SearchPage/index.js
@@ -219,7 +219,7 @@ When('you clear the values', () => {
 
 Then('there should be a validation error message', () => {
     cy.get('[data-test="form-attributes"]')
-        .contains('Fill in at least 1 attributes to search')
+        .contains('Fill in at least 1 attribute to search')
         .shouldIncludeClass('textError');
 });
 

diff --git a/cypress/integration/SearchThroughAddRelationship/index.js b/cypress/integration/SearchThroughAddRelationship/index.js
@@ -41,7 +41,7 @@ And('you can see an empty page', () => {
 });
 
 And('there should be a validation error message', () => {
-    cy.contains('Fill in at least 1 attributes to search')
+    cy.contains('Fill in at least 1 attribute to search')
         .should('exist');
     cy.get('[data-test="d2-form-area"]')
         .find('[class*=minAttribtuesRequiredInvalid]');

diff --git a/cypress/integration/TopBarActions/index.js b/cypress/integration/TopBarActions/index.js
@@ -10,8 +10,8 @@ When(/^the user clicks on the edit button/, () =>
 );
 
 Then('the user sees the warning popup', () => {
-    cy.contains('Unsaved changes');
-    cy.contains('Leaving this page will discard the changes you made to this event.');
+    cy.contains('Discard unsaved changes?');
+    cy.contains('This event has unsaved changes. Leaving this page without saving will lose these changes. Are you sure you want to discard unsaved changes?');
 });
 
 When(/^the user set the WHOMCH Diastolic blood pressure to (.*)/, score =>

diff --git a/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEventSchedule/index.js b/cypress/integration/WidgetsForEnrollmentPages/WidgetsForEventSchedule/index.js
@@ -19,10 +19,10 @@ When('you click cancel in Schedule tab', () => {
 Then('you should see confirm dialog', () => {
     cy.get('[role="dialog"]')
         .find('[data-test="dhis2-uicore-modaltitle"]')
-        .contains('Unsaved changes')
+        .contains('Discard unsaved changes?')
         .should('exist');
 
     cy.get('[role="dialog"]')
         .find('[data-test="dhis2-uicore-button"]')
-        .contains('Yes, discard').click({ force: true }); // Add {force:true} to disable the error due to layer parent has css display: none
+        .contains('Yes, discard changes').click({ force: true }); // Add {force:true} to disable the error due to layer parent has css display: none
 });
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -8,8 +8,7 @@ Given('you open the main page with Ngelehun and child programme context', () =>
 
 Given('you open the main page with Ngelehun and WHO RMNCH Tracker context', () => {
     cy.visit('#/?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8');
-    cy.get('[data-test="search-page-content"]')
-        .contains('Create saved list')
+    cy.get('[data-test="template-selector-create-list"]')
         .click();
 });
 
@@ -19,8 +18,7 @@ Given('you open the main page with Ngelehun and Malaria focus investigation cont
 
 Given('you open the main page with Ngelehun, WHO RMNCH Tracker and First antenatal care visit context', () => {
     cy.visit('#/?programId=WSGAb5XwJ3Y&orgUnitId=DiszpKrYNg8');
-    cy.get('[data-test="search-page-content"]')
-        .contains('Create saved list')
+    cy.get('[data-test="template-selector-create-list"]')
         .click();
 
     cy.get('[data-test="tei-working-lists"]')

diff --git a/docs/user/using-the-capture-app.md b/docs/user/using-the-capture-app.md
@@ -152,7 +152,8 @@ The second option, is to register a tracked entity instance with program and enr
     the field. This will open a map where you can search for a location and capture
     a polygon (button in the upper right corner of the map).
 
-7. Click **Save new** to register the tracked entity instance.
+7. Click **Save new** to register the tracked entity instance. 
+    The **Save** button shows a loading spinner and the **Cancel** button is disabled while the request is processing.
 
 8. You will now be prompted to the tracked entity instance dashboard.