Merge branch 'DHIS2-13237' into DHIS2-6335

.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:

.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

CHANGELOG.md

@@ -1,3 +1,94 @@
+## [100.35.5](https://github.com/dhis2/capture-app/compare/v100.35.4...v100.35.5) (2023-08-03)
+
+
+### Bug Fixes
+
+* [DHIS2-15365] remove orgUnit and ouMode query args ([#3398](https://github.com/dhis2/capture-app/issues/3398)) ([ef35eb3](https://github.com/dhis2/capture-app/commit/ef35eb300fa61343576957e6734a2767dc37b4ec))
+
+## [100.35.4](https://github.com/dhis2/capture-app/compare/v100.35.3...v100.35.4) (2023-08-01)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([343e5da](https://github.com/dhis2/capture-app/commit/343e5daa158faf257cdf1277ff8f7a3e0e5d24ec))
+
+## [100.35.3](https://github.com/dhis2/capture-app/compare/v100.35.2...v100.35.3) (2023-07-27)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([4568f0f](https://github.com/dhis2/capture-app/commit/4568f0f3da3bc979a64bf3650c8e658756f2a580))
+
+## [100.35.2](https://github.com/dhis2/capture-app/compare/v100.35.1...v100.35.2) (2023-07-26)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([085b3a3](https://github.com/dhis2/capture-app/commit/085b3a3eb5e1fe67cc66d1ef741dde64dabfdc7e))
+
+## [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)
 
 

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

cypress/integration/NewPage/index.js

@@ -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');
+    });
+});

cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js

@@ -62,7 +62,6 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis and House
 
 Then('the default working list should be displayed', () => {
     const names = [
-        'John',
         'Filona',
         'Gertrude',
         'Frank',
@@ -77,6 +76,7 @@ Then('the default working list should be displayed', () => {
         'Julia',
         'Elizabeth',
         'Donald',
+        'Wayne',
     ];
 
     cy.get('[data-test="tei-working-lists"]')
@@ -276,7 +276,6 @@ Then('the registering unit should display in the list', () => {
 
 Then('the list should display data for the second page', () => {
     const names = [
-        'Wayne',
         'Johnny',
         'Donna',
         'Sharon',
@@ -291,6 +290,7 @@ Then('the list should display data for the second page', () => {
         'Noah',
         'Emily',
         'Lily',
+        'Olvia',
     ];
 
     cy.get('[data-test="tei-working-lists"]')
@@ -307,7 +307,6 @@ Then('the list should display data for the second page', () => {
 
 Then('the list should display 10 rows of data', () => {
     const names = [
-        'John',
         'Filona',
         'Gertrud',
         'Frank',
@@ -317,6 +316,7 @@ Then('the list should display 10 rows of data', () => {
         'Alan',
         'Heather',
         'Andrea',
+        'Donald',
     ];
 
     cy.get('[data-test="tei-working-lists"]')