fix: merge conflict

.eslintrc

@@ -135,7 +135,8 @@
             "node": { "extensions": [".js", ".mjs"] },
             "webpack": {
                 "config": "config/eslint/webpack.config.js"
-            }
+            },
+            "exports": {}
         },
         "import/core-modules": ["rxjs/operators"]
     }

.flowconfig

@@ -12,5 +12,6 @@ src/core_modules/capture-core/flow/
 module.name_mapper='^capture-core' ->'<PROJECT_ROOT>/src/core_modules/capture-core'
 module.name_mapper='^capture-ui' ->'<PROJECT_ROOT>/src/core_modules/capture-ui'
 module.name_mapper='^capture-core-utils' ->'<PROJECT_ROOT>/src/core_modules/capture-core-utils'
+module.name_mapper='^@dhis2/app-runtime/experimental' ->'<PROJECT_ROOT>/node_modules/@dhis2/app-runtime/build/es/experimental'
 module.name_mapper='^@dhis2/rules-engine-javascript' ->'<PROJECT_ROOT>/packages/rules-engine/src'
 esproposal.optional_chaining=enable

CHANGELOG.md

@@ -1,3 +1,73 @@
+## [100.76.1](https://github.com/dhis2/capture-app/compare/v100.76.0...v100.76.1) (2024-08-09)
+
+
+### Bug Fixes
+
+* [DHIS2-17632][DHIS2-17633] restrict invalid category combo for orgUnit ([#3738](https://github.com/dhis2/capture-app/issues/3738)) ([bfffe06](https://github.com/dhis2/capture-app/commit/bfffe069e3c16387dc0da6c08ed25b91f3f55bf1))
+
+# [100.76.0](https://github.com/dhis2/capture-app/compare/v100.75.1...v100.76.0) (2024-08-08)
+
+
+### Features
+
+* [DHIS2-17171] preview images in versions prior to 41 ([#3694](https://github.com/dhis2/capture-app/issues/3694)) ([2f51805](https://github.com/dhis2/capture-app/commit/2f51805b469d74b57bff7c927a9aa76420913ea1))
+
+## [100.75.1](https://github.com/dhis2/capture-app/compare/v100.75.0...v100.75.1) (2024-08-08)
+
+
+### Bug Fixes
+
+* [DHIS2-17859] Add missing ids to Enrollment plugin ([#3748](https://github.com/dhis2/capture-app/issues/3748)) ([19c77ec](https://github.com/dhis2/capture-app/commit/19c77ec50c2fff0deef948abd516726b51f95418))
+
+# [100.75.0](https://github.com/dhis2/capture-app/compare/v100.74.0...v100.75.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-17726] Plugins in Profile Widget ([#3709](https://github.com/dhis2/capture-app/issues/3709)) ([d783ade](https://github.com/dhis2/capture-app/commit/d783ade253e27badf03d267d8a3935186b170fd8))
+
+# [100.74.0](https://github.com/dhis2/capture-app/compare/v100.73.0...v100.74.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-17591][DHIS2-17607] Plugins in event forms ([#3684](https://github.com/dhis2/capture-app/issues/3684)) ([205b9f5](https://github.com/dhis2/capture-app/commit/205b9f5746f3d9b3d0d28035fd99e40b5649003c))
+
+# [100.73.0](https://github.com/dhis2/capture-app/compare/v100.72.0...v100.73.0) (2024-08-07)
+
+
+### Features
+
+* [DHIS2-16125] hide program stage under certain circumstances ([#3735](https://github.com/dhis2/capture-app/issues/3735)) ([c6b6dc0](https://github.com/dhis2/capture-app/commit/c6b6dc0330d8c92d8334fb1f0b34a5524ebb2967))
+
+# [100.72.0](https://github.com/dhis2/capture-app/compare/v100.71.3...v100.72.0) (2024-08-06)
+
+
+### Features
+
+* [DHIS2-17648] Replace Material UI FormGroup, FormLabel and FormControl ([#3713](https://github.com/dhis2/capture-app/issues/3713)) ([f4af266](https://github.com/dhis2/capture-app/commit/f4af266142c95a6d8e899d0bc5b8d3ae90f38f85))
+
+## [100.71.3](https://github.com/dhis2/capture-app/compare/v100.71.2...v100.71.3) (2024-08-06)
+
+
+### Bug Fixes
+
+* [DHIS2-17516] bad request when sorting in the working lists ([#3737](https://github.com/dhis2/capture-app/issues/3737)) ([69af6ec](https://github.com/dhis2/capture-app/commit/69af6ecdff0bdb6ca67b051aae8c26d519d27d55))
+
+## [100.71.2](https://github.com/dhis2/capture-app/compare/v100.71.1...v100.71.2) (2024-08-04)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([0406022](https://github.com/dhis2/capture-app/commit/04060229ee917101907462edd3b18c7ae4cdb8a4))
+
+## [100.71.1](https://github.com/dhis2/capture-app/compare/v100.71.0...v100.71.1) (2024-08-02)
+
+
+### Bug Fixes
+
+* [DHIS2-16373] cannot change AOC on existing events in Tracker program ([#3731](https://github.com/dhis2/capture-app/issues/3731)) ([f61c925](https://github.com/dhis2/capture-app/commit/f61c9253e028c3b683a2d5b153751c05ddb9c6f8))
+
 # [100.71.0](https://github.com/dhis2/capture-app/compare/v100.70.15...v100.71.0) (2024-07-29)
 
 

cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.feature

@@ -2,5 +2,5 @@ Feature: Hidden program stage
 
     Scenario: The user cannot add an event in a hidden program stage
         Given you add an enrollment event that will result in a rule effect to hide a program stage
-        Then the New Postpartum care visit event button is disabled in the stages and events widget
+        Then the Postpartum care visit stage should not be displayed in the Stages and Events widget
         And the Postpartum care visit button is disabled in the enrollmentEventNew page

cypress/e2e/EnrollmentPage/HiddenProgramStage/HiddenProgramStage.js

@@ -43,9 +43,8 @@ Given('you add an enrollment event that will result in a rule effect to hide a p
     cy.contains('[data-test="dhis2-uicore-button"]', 'Save without completing').click();
 });
 
-Then('the New Postpartum care visit event button is disabled in the stages and events widget', () => {
-    cy.contains('[data-test="create-new-button"]', 'New Postpartum care visit event')
-        .should('be.disabled');
+Then('the Postpartum care visit stage should not be displayed in the Stages and Events widget', () => {
+    cy.get('[data-test="stages-and-events-widget"]').should('not.contain', 'Postpartum care visit');
 });
 
 Then('the Postpartum care visit button is disabled in the enrollmentEventNew page', () => {

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

@@ -389,11 +389,11 @@ When('you set the date of admission filter', () => {
         .within(() => {
             cy.contains('More filters')
                 .click();
-
-            cy.contains('Date of admission')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Date of admission').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .within(() => {
             cy.get('input[type="text"]')

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

@@ -42,10 +42,11 @@ Given('you open the main page with Ngelehun, WHO RMNCH Tracker and First antenat
         .within(() => {
             cy.contains('More filters')
                 .click();
-            cy.contains('Program stage')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Program stage').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .contains('First antenatal care visit')
         .click();
@@ -66,10 +67,11 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis and House
         .within(() => {
             cy.contains('More filters')
                 .click();
-            cy.contains('Program stage')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Program stage').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .contains('Household investigation')
         .click();
@@ -186,10 +188,11 @@ When('you set the WHOMCH Smoking filter to No', () => {
         .within(() => {
             cy.get('[data-test="more-filters"]').eq(1)
                 .click();
-            cy.contains('WHOMCH Smoking')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('WHOMCH Smoking').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .contains('No')
         .click();
@@ -581,9 +584,9 @@ When('you open the program stage filters from the more filters dropdown menu', (
         .within(() => {
             cy.contains('More filters')
                 .click();
-            cy.contains('Program stage')
-                .click();
         });
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Program stage').click());
 });
 
 Then('you see the program stages and the default events filters', () => {
@@ -744,10 +747,11 @@ Given('you open the main page with Ngelehun and WHO RMNCH Tracker context and co
         .within(() => {
             cy.contains('More filters')
                 .click();
-            cy.contains('Program stage')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Program stage').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .contains('Postpartum care visit')
         .click();
@@ -763,10 +767,11 @@ Given('you open the main page with all accesible records in the WHO RMNCH Tracke
         .within(() => {
             cy.contains('More filters')
                 .click();
-            cy.contains('Program stage')
-                .click();
         });
 
+    cy.get('[data-test="more-filters-menu"]')
+        .within(() => cy.contains('Program stage').click());
+
     cy.get('[data-test="list-view-filter-contents"]')
         .contains('Postpartum care visit')
         .click();

cypress/support/cucumberPreprocessor.js

@@ -18,7 +18,7 @@ module.exports = async function cucumberPreprocessor(on, config) {
                             test: /\.feature$/,
                             use: [
                                 {
-                                    loader: '@badeball/cypress-cucumber-preprocessor/dist/bundler-utils/webpack',
+                                    loader: '@badeball/cypress-cucumber-preprocessor/webpack',
                                     options: config,
                                 },
                             ],