Merge branch 'master' into BETA-116

.github/workflows/verify-app.yml

@@ -193,7 +193,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
-      - uses: dhis2/action-semantic-release@ignore-app-hub-lib
+      - uses: dhis2/action-semantic-release@use-yarn-version-prepare
         with:
           publish-apphub: true
           publish-github: true

CHANGELOG.md

@@ -1,3 +1,57 @@
+## [100.68.4](https://github.com/dhis2/capture-app/compare/v100.68.3...v100.68.4) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17225] cannot add TET with polygon or coordiante ([#3618](https://github.com/dhis2/capture-app/issues/3618)) ([6a0bb73](https://github.com/dhis2/capture-app/commit/6a0bb73b2c9cfba5361e5bbb9b1f4218b3200cd3))
+
+## [100.68.3](https://github.com/dhis2/capture-app/compare/v100.68.2...v100.68.3) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-16931] Working list hides delete button ([#3603](https://github.com/dhis2/capture-app/issues/3603)) ([21d9d6e](https://github.com/dhis2/capture-app/commit/21d9d6e985fb17548745c065f8415866fdb19394))
+* [DHIS2-17044] missing singular translation ([#3598](https://github.com/dhis2/capture-app/issues/3598)) ([9a7261c](https://github.com/dhis2/capture-app/commit/9a7261c6d43f3667edb162882d841025fb08fff0))
+* [DHIS2-17096] show/hide option groups in profile widget ([#3593](https://github.com/dhis2/capture-app/issues/3593)) ([8aa8695](https://github.com/dhis2/capture-app/commit/8aa86956d8df15518a536b0dc51fa908cb9cb6db))
+* [DHIS2-17161] Do not update attribute values from enrollment Widget ([#3601](https://github.com/dhis2/capture-app/issues/3601)) ([7750761](https://github.com/dhis2/capture-app/commit/7750761b3e20a7ed36ff96831c5bbd3cb0e78263))
+* [DHIS2-17177] Registration page stuck after failed save ([#3595](https://github.com/dhis2/capture-app/issues/3595)) ([83e0399](https://github.com/dhis2/capture-app/commit/83e039951ab7d3188f75cb059f79dd5292f346fd))
+
+## [100.68.2](https://github.com/dhis2/capture-app/compare/v100.68.1...v100.68.2) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17131] schedule dates with format DD-MM-YYYY ([#3584](https://github.com/dhis2/capture-app/issues/3584)) ([3237698](https://github.com/dhis2/capture-app/commit/3237698f77b62cf0b5c690b9a1db74d627bea5dc))
+
+## [100.68.1](https://github.com/dhis2/capture-app/compare/v100.68.0...v100.68.1) (2024-04-28)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([2dc29b8](https://github.com/dhis2/capture-app/commit/2dc29b8e3b1e97b9a9f6304359387a7fe8980685))
+
+# [100.68.0](https://github.com/dhis2/capture-app/compare/v100.67.12...v100.68.0) (2024-04-25)
+
+
+### Features
+
+* [DHIS2-13299][DHIS2-16291] Related Stages ([#3488](https://github.com/dhis2/capture-app/issues/3488)) ([85f38be](https://github.com/dhis2/capture-app/commit/85f38bedd60c307788cf17237338765bf9fed7f0))
+
+## [100.67.12](https://github.com/dhis2/capture-app/compare/v100.67.11...v100.67.12) (2024-04-22)
+
+
+### Bug Fixes
+
+* [DHIS2-14938] trigger error on complete ([#3594](https://github.com/dhis2/capture-app/issues/3594)) ([005877c](https://github.com/dhis2/capture-app/commit/005877ce88a2d28dfc053b39869090cd9573bfdd))
+* [DHIS2-16999] filter assign rule effects in the view event page ([#3597](https://github.com/dhis2/capture-app/issues/3597)) ([f2007e3](https://github.com/dhis2/capture-app/commit/f2007e368b0844730ed36c654e1e01323fb92ed2))
+
+## [100.67.11](https://github.com/dhis2/capture-app/compare/v100.67.10...v100.67.11) (2024-04-14)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([ab8a812](https://github.com/dhis2/capture-app/commit/ab8a812b59f96f250f58e451e78ab83ccda71863))
+
 ## [100.67.10](https://github.com/dhis2/capture-app/compare/v100.67.9...v100.67.10) (2024-03-31)
 
 

cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/index.js

@@ -95,7 +95,7 @@ Given('you land on the enrollment page by having typed only the enrollmentId in
         .contains('Enrollment Dashboard');
     cy.contains('[data-test="scope-selector"]', 'Carlos Cruz');
     cy.contains('[data-test="scope-selector"]', 'Taninahun (Malen) CHP');
-    cy.contains('1 events');
+    cy.contains('1 event');
 });
 
 When('you reset the tei selection', () => {

cypress/e2e/NewPage.feature

@@ -224,3 +224,15 @@ Feature: User creates a new entries from the registration page
   Scenario: First stage appears on registration page
     Given you are in Child programme registration page
     Then the first stage appears on registration page
+
+  Scenario: New malaria entity without enrollment
+  Given you are in the registration page with Ngelehun CHC org unit selected
+  And you select Malaria Entity from the available tracked entity types
+  And you click the location button
+  Then the map opens
+
+  Scenario: New focus area without enrollment 
+  Given you are in the registration page with Ngelehun CHC org unit selected
+  And you select Focus area from the available tracked entity types
+  And the user clicks the element containing the text: Choose area on map
+  Then the map opens

cypress/e2e/NewPage/index.js

@@ -7,6 +7,10 @@ And('you are on the default registration page', () => {
     cy.visit('/#/new');
 });
 
+Given('you are in the registration page with Ngelehun CHC org unit selected', () => {
+    cy.visit('/#/new?orgUnitId=DiszpKrYNg8');
+});
+
 And('there should be informative message explaining you need to select an organisation unit', () => {
     cy.get('[data-test="informative-paper"]')
         .contains('Choose a registering unit to start reporting')
@@ -638,3 +642,20 @@ And('you delete the recently added tracked entity', () => {
     });
     cy.url().should('include', 'selectedTemplateId=IpHINAT79UW');
 });
+
+And(/^you select (.*) from the available tracked entity types/, (selection) => {
+    cy.get('[data-test="dhis2-uicore-select-input"]')
+        .click();
+    cy.contains(selection)
+        .click();
+});
+
+And('you click the location button', () => {
+    cy.get('[data-test="mapIconButton"]')
+        .click();
+});
+
+Then('the map opens', () => {
+    cy.get('.leaflet-container').should('exist');
+});
+

cypress/e2e/SmokeTests.feature

@@ -5,7 +5,8 @@ Feature: Smoke tests
         Given you open the App without auth cookie
         Then you should see the login prompt
 
-    @skip-login
+    # login form is not working for v42 currently
+    @skip-login @v<42
     Scenario: Show app main selections and header bar: without auth cookie
         Given you open the App without auth cookie
         When you fill in credentials

cypress/support/commands.js

@@ -28,3 +28,36 @@ Cypress.Commands.add('forceVisit', (url) => {
     cy.visit(url);
     cy.window().then((win) => { win.location.href = url; });
 });
+
+// overrides loginByApi from @dhis2/cypress-commands
+// temporary solution: should use solution from @dhis2/cypres-commands when available
+Cypress.Commands.add('loginByApi', ({ username, password, baseUrl }) => {
+    const currentInstanceVersion = Number(/[.](\d+)/.exec(Cypress.env('dhis2InstanceVersion'))[1]);
+
+    if (currentInstanceVersion >= 42) {
+        cy.request({
+            url: `${baseUrl}/api/auth/login`,
+            method: 'POST',
+            followRedirect: true,
+            body: {
+                username,
+                password,
+            },
+        });
+    } else {
+        cy.request({
+            url: `${baseUrl}/dhis-web-commons-security/login.action`,
+            method: 'POST',
+            form: true,
+            followRedirect: true,
+            body: {
+                j_username: username,
+                j_password: password,
+                '2fa_code': '',
+            },
+        });
+    }
+
+    // Set base url for the app platform
+    window.localStorage.setItem('DHIS2_BASE_URL', baseUrl);
+});

i18n/ar.po

@@ -2,15 +2,15 @@
 # Translators:
 # KRG HIS <[email protected]>, 2020
 # Philip Larsen Donnelly, 2023
-# Viktor Varland <[email protected]>, 2024
 # Hamza Assada <[email protected]>, 2024
+# Viktor Varland <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Hamza Assada <[email protected]>, 2024\n"
+"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -693,6 +693,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -776,6 +782,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr "اختر وحدة تسجيل لبدء الإبلاغ"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -938,12 +950,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "البرنامج المحدد"
 
@@ -1427,6 +1433,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "نموذج الكيان المتتبع"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "التاريخ المقرر"
+
+msgid "Report date"
+msgstr "تاريخ التقرير"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1538,15 +1573,6 @@ msgstr "اسم مرحلة البرنامج"
 msgid "Working list could not be loaded"
 msgstr "تعذر تحميل قائمة العمل"
 
-msgid "Download as JSON"
-msgstr "تنزيل كملف JSON"
-
-msgid "Download as CSV"
-msgstr "تنزيل كملف CSV"
-
-msgid "Download with current filters"
-msgstr "تنزيل مع اعتماد عوامل التصفية الحالية"
-
 msgid "Download data..."
 msgstr "تنزيل البيانات"
 
@@ -1619,6 +1645,15 @@ msgstr "إظهار أقل"
 msgid "Show All"
 msgstr "إظهار الكل"
 
+msgid "Download as JSON"
+msgstr "تنزيل كملف JSON"
+
+msgid "Download as CSV"
+msgstr "تنزيل كملف CSV"
+
+msgid "Download with current filters"
+msgstr "تنزيل مع اعتماد عوامل التصفية الحالية"
+
 msgid "An error has occured. See log for details"
 msgstr "حدث خطأ. انظر السجل للحصول على التفاصيل"