Merge branch 'master' into DHIS2-6335

CHANGELOG.md

@@ -1,3 +1,93 @@
+## [100.50.3](https://github.com/dhis2/capture-app/compare/v100.50.2...v100.50.3) (2023-12-24)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([c92b38e](https://github.com/dhis2/capture-app/commit/c92b38e8f775d20476fc0e2619f95ba48377ec5a))
+
+## [100.50.2](https://github.com/dhis2/capture-app/compare/v100.50.1...v100.50.2) (2023-12-20)
+
+
+### Bug Fixes
+
+* [TECH-1676] cypress test deleting wrong working list template ([#3489](https://github.com/dhis2/capture-app/issues/3489)) ([b5e038b](https://github.com/dhis2/capture-app/commit/b5e038b823128386f7106da46025a2a38a00db1b))
+
+## [100.50.1](https://github.com/dhis2/capture-app/compare/v100.50.0...v100.50.1) (2023-12-20)
+
+
+### Bug Fixes
+
+* [DHIS2-16317] Incorrect error message on orgUnit type data element ([#3484](https://github.com/dhis2/capture-app/issues/3484)) ([ef30449](https://github.com/dhis2/capture-app/commit/ef304499fda3296320ca71fae72d33f2dfad88fa))
+
+# [100.50.0](https://github.com/dhis2/capture-app/compare/v100.49.0...v100.50.0) (2023-12-18)
+
+
+### Features
+
+* [DHIS-11419] display assigned users on events in enrollment overview page ([#3453](https://github.com/dhis2/capture-app/issues/3453)) ([44fb2be](https://github.com/dhis2/capture-app/commit/44fb2bedf0e2f9d394c58d5a588087cff2c8fa3c))
+
+# [100.49.0](https://github.com/dhis2/capture-app/compare/v100.48.0...v100.49.0) (2023-12-18)
+
+
+### Features
+
+* [DHIS2-12544] Add verbose logging to rules engine ([#3480](https://github.com/dhis2/capture-app/issues/3480)) ([2a6d4a8](https://github.com/dhis2/capture-app/commit/2a6d4a839ae0daed7b2ddbf09a401c29dbb3cfd7))
+
+# [100.48.0](https://github.com/dhis2/capture-app/compare/v100.47.3...v100.48.0) (2023-12-15)
+
+
+### Features
+
+* [DHIS2-15783] Tooltip on long working list names ([#3474](https://github.com/dhis2/capture-app/issues/3474)) ([6263aa8](https://github.com/dhis2/capture-app/commit/6263aa8a2114b028afff3b78c39f699c0946e682))
+
+## [100.47.3](https://github.com/dhis2/capture-app/compare/v100.47.2...v100.47.3) (2023-12-14)
+
+
+### Bug Fixes
+
+* [DHIS2-16084] Filter unidirectional relationship types ([#3477](https://github.com/dhis2/capture-app/issues/3477)) ([3579fc0](https://github.com/dhis2/capture-app/commit/3579fc05d02f6210f381f93414d07b60a0cfea53))
+
+## [100.47.2](https://github.com/dhis2/capture-app/compare/v100.47.1...v100.47.2) (2023-12-10)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([1a4e748](https://github.com/dhis2/capture-app/commit/1a4e7482467656e19ce58f34862a306e6ae008cc))
+
+## [100.47.1](https://github.com/dhis2/capture-app/compare/v100.47.0...v100.47.1) (2023-12-05)
+
+
+### Bug Fixes
+
+* [DHIS2-15694] Cancel button in Relationship ([#3471](https://github.com/dhis2/capture-app/issues/3471)) ([c1dfbdb](https://github.com/dhis2/capture-app/commit/c1dfbdb3352388bba7d51b8bc2b9d033d10967c3))
+* [DHIS2-15983] Enrollment date not assigned on form init ([#3475](https://github.com/dhis2/capture-app/issues/3475)) ([a13a766](https://github.com/dhis2/capture-app/commit/a13a766ea463514dfdd090b8d40db6406dac80bb))
+
+# [100.47.0](https://github.com/dhis2/capture-app/compare/v100.46.1...v100.47.0) (2023-12-03)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([e20fb8c](https://github.com/dhis2/capture-app/commit/e20fb8c551aefb0546c5973dd87940d56e3018be))
+
+
+### Features
+
+* [DHIS2-16123] Add inheritable TEAs to Relationships ([#3464](https://github.com/dhis2/capture-app/issues/3464)) ([620b008](https://github.com/dhis2/capture-app/commit/620b00832da7c4951d6e905b40317dd0acca0aa6))
+
+## [100.46.1](https://github.com/dhis2/capture-app/compare/v100.46.0...v100.46.1) (2023-11-30)
+
+
+### Bug Fixes
+
+* [DHIS2-15686] fix program rule variables for edit profile mode ([#3463](https://github.com/dhis2/capture-app/issues/3463)) ([a24bb27](https://github.com/dhis2/capture-app/commit/a24bb2723f06cd4a3ca87bbbb22977b097377b3c))
+
+# [100.46.0](https://github.com/dhis2/capture-app/compare/v100.45.2...v100.46.0) (2023-11-30)
+
+
+### Features
+
+* [DHIS2-14275] Support custom icons ([#3473](https://github.com/dhis2/capture-app/issues/3473)) ([2404fca](https://github.com/dhis2/capture-app/commit/2404fca8085965e699ae518cfe816f2f3d38dea7))
+
 ## [100.45.2](https://github.com/dhis2/capture-app/compare/v100.45.1...v100.45.2) (2023-11-29)
 
 

cypress/e2e/MainPage.feature

@@ -42,3 +42,15 @@ Feature: User interacts with Main page
         Then you see the opt out component for Child Programme
         When you opt out to use the new enrollment Dashboard for Child Programme
         Then you see the opt in component for Child Programme
+
+    @v<41
+    Scenario: The icon is rendered as an svg
+        Given you are in the main page with no selections made
+        When you select Child Programme
+        Then the icon is rendered as an svg
+
+    @v>=41
+    Scenario: The icon is rendered as a custom icon
+        Given you are in the main page with no selections made
+        When you select Child Programme
+        Then the icon is rendered as a custom icon

cypress/e2e/MainPage/index.js

@@ -20,6 +20,18 @@ And('you can load the view with the name Events assigned to me', () => {
         });
 });
 
+Then('the icon is rendered as a custom icon', () => {
+    cy.get('[alt="child_program_positive"]')
+        .invoke('attr', 'src')
+        .should('match', /\/icons\/child_program_positive\/icon$/);
+});
+
+Then('the icon is rendered as an svg', () => {
+    cy.get('[alt="child_program_positive"]')
+        .invoke('attr', 'src')
+        .should('match', /\/icons\/child_program_positive\/icon.svg$/);
+});
+
 Then('the TEI working list is displayed', () => {
     cy.get('[data-test="tei-working-lists"]').within(() => {
         cy.contains('Rows per page').should('exist');

cypress/e2e/NewEventThroughAddRelationship.feature

@@ -23,3 +23,8 @@ Feature: User adds events
         And you submit the event form with the associated relationship to the already existing person
         Then the event and relationship should be sent to the server successfully
 
+    Scenario: User gets navigated correctly when clicking on the back button
+        Given you open the the new event page in Ngelehun and malaria case context
+        When you navigate to register a person relationship
+        And you click the cancel button
+        Then you should be navigated back to the event form

cypress/e2e/NewEventThroughAddRelationship/index.js

@@ -168,3 +168,12 @@ Then('the event and relationship should be sent to the server successfully', ()
                 });
         });
 });
+
+When('you click the cancel button', () => {
+    cy.get('[data-test="cancel-button"]')
+        .click();
+});
+
+Then('you should be navigated back to the event form', () => {
+    cy.contains('New Malaria case registration');
+});

cypress/e2e/NewPage.feature

@@ -94,6 +94,13 @@ Feature: User creates a new entries from the registration page
     Then you are navigated to the Antenatal care visit registration page
     Then program and organisation unit is still selected in top bar
 
+  Scenario: Clicking the cancel button should navigate with correct context
+    Given you are on the default registration page
+    And you select org unit
+    And you select Child Programme
+    When you click the cancel button
+    Then you are navigated to the working list with programId IpHINAT79UW
+
 
 ### New event in Antenatal care visit
   Scenario: New event in Antenatal care visit > Submitting the form with empty visit date throws validation error

cypress/e2e/SearchPage/index.js

@@ -81,7 +81,6 @@ When('you can close the modal', () => {
         .contains('Back to search')
         .click();
     cy.get('[data-test="dhis2-uicore-modal"]')
-        .contains('No results found')
         .should('not.exist');
 });
 

cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule.feature

@@ -1,8 +1,10 @@
 Feature: The user interacts with the widgets Schedule tab
 
+    # Blocked by DHIS2-16229
+    @skip
     Scenario: User cancel after choose a schedule date in schedule tab
         Given you land on the enrollment add event page by having typed #/enrollmentEventNew?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=EaOyKGOIGRp&enrollmentId=wBU0RAsYjKE&stageId=A03MvHHogjR&tab=SCHEDULE
         Then you should see Schedule tab
         Then you choose a schedule date
         When you click cancel in Schedule tab
-        Then you should see confirm dialog
+        Then you should see confirm dialog

cypress/e2e/WidgetsForEnrollmentPages/WidgetsForEventSchedule/index.js

@@ -18,7 +18,7 @@ When('you click cancel in Schedule tab', () => {
 });
 
 Then('you should see confirm dialog', () => {
-    cy.get('[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .find('[data-test="dhis2-uicore-modaltitle"]')
         .contains('Discard unsaved changes?')
         .should('exist');

cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js

@@ -148,12 +148,12 @@ When('you open the column selector', () => {
 });
 
 When('you select Household location and save from the column selector', () => {
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Household location')
         .find('input')
         .click();
 
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Save')
         .click();
 });

cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature

@@ -1,5 +1,13 @@
 Feature: User interacts with tei working lists
 
+  Scenario: The TEI custom working can be shared
+    Given you open the main page with Ngelehun and Malaria focus investigation context
+    And you see the custom TEI working lists
+    And you can load the view with the name Events assigned to me
+    And you create a copy of the working list
+    When you change the sharing settings
+    Then you see the new sharing settings
+
 Scenario: User opens the default working list for a tracker program
 Given you open the main page with Ngelehun and child programme context
 Then the default working list should be displayed
@@ -81,7 +89,7 @@ When you change rows per page to 10
 Then the list should display 10 rows of data
 And for a tracker program the page navigation should show that you are on the first page
 
-Scenario: Show teis ordered ascendingly by first name 
+Scenario: Show teis ordered ascendingly by first name
 Given you open the main page with Ngelehun and child programme context
 When you click the first name column header
 Then the sort arrow should indicate ascending order
@@ -93,13 +101,7 @@ Given you open the main page with Ngelehun and Malaria focus investigation conte
 Then you see the custom TEI working lists
 And you can load the view with the name Events assigned to me
 
-Scenario: The TEI custom working can be shared
-Given you open the main page with Ngelehun and Malaria focus investigation context
-And you see the custom TEI working lists
-And you can load the view with the name Events assigned to me
-And you create a copy of the working list
-When you change the sharing settings
-Then you see the new sharing settings
+
 
 Scenario: The user creates, updates and deletes a TEI custom working list
 Given you open the main page with Ngelehun and Malaria case diagnosis context
@@ -139,7 +141,7 @@ And you select a data element columns and save from the column selector
 Then you see data elements specific filters and columns
 
 @v>=39
-Scenario: While in a program stage working list, the user can filter by both TEA and data elements 
+Scenario: While in a program stage working list, the user can filter by both TEA and data elements
 Given you open the main page with Ngelehun, WHO RMNCH Tracker and First antenatal care visit context
 When you set the enrollment status filter to active
 And you apply the current filter
@@ -152,7 +154,7 @@ And you apply the current filter
 Then the list should display 1 row of data
 
 @v>=39
-Scenario: While in a program stage working list, the user can sort by both TEA and data elements 
+Scenario: While in a program stage working list, the user can sort by both TEA and data elements
 Given you open the main page with Ngelehun, WHO RMNCH Tracker and First antenatal care visit context
 And you set the first name filter to u
 And you apply the current filter

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

@@ -246,12 +246,12 @@ When('you open the column selector', () => {
 });
 
 When('you select the registering unit and save from the column selector', () => {
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Registering unit')
         .find('input')
         .click();
 
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Save')
         .click();
 });
@@ -544,27 +544,33 @@ Then('you see the new sharing settings', () => {
         .click();
 });
 
-When('you create a copy of the working list', () => {
-    cy.get('[data-test="list-view-menu-button"]')
-        .click();
+When('you create a copy of the working list',
+    () => {
+        cy.get('[data-test="list-view-menu-button"]')
+            .click();
 
-    cy.contains('Save current view as')
-        .click();
+        cy.contains('Save current view as')
+            .click();
 
-    const id = uuid();
-    cy.get('[data-test="view-name-content"]')
-        .type(id);
+        const id = uuid();
+        cy.get('[data-test="view-name-content"]')
+            .type(id);
 
-    cy.intercept('POST', '**/trackedEntityInstanceFilters**').as('newTrackerFilter');
+        cy.intercept('POST', '**/trackedEntityInstanceFilters**')
+            .as('newTrackerFilter');
 
-    cy.get('button')
-        .contains('Save')
-        .click();
+        cy.get('[data-test="new-template-dialog"]')
+            .within(() => {
+                cy.get('[data-test="dhis2-uicore-button"]')
+                    .contains('Save')
+                    .click();
+            });
 
-    cy.wait('@newTrackerFilter', { timeout: 30000 });
+        cy.wait('@newTrackerFilter', { timeout: 30000 });
+        cy.url({ timeout: 30000 }).should('not.include', 'selectedTemplateId=PpGINOT00UX');
 
-    cy.reload();
-});
+        cy.reload();
+    });
 
 When('you open the program stage filters from the more filters dropdown menu', () => {
     cy.get('[data-test="tei-working-lists"]')
@@ -602,12 +608,12 @@ When('you select the Foci response program stage', () => {
 });
 
 When('you select a data element columns and save from the column selector', () => {
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('People included')
         .find('input')
         .click();
 
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Save')
         .click();
 });
@@ -663,12 +669,12 @@ Then('you see scheduledAt filter', () => {
 });
 
 When('you select a scheduledAt column and save from the column selector', () => {
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Appointment date')
         .find('input')
         .click();
 
-    cy.get('div[role="dialog"]')
+    cy.get('aside[role="dialog"]')
         .contains('Save')
         .click();
 });