Merge branch 'master' into DHIS2-15185-datatable

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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)
 
 

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"]')

package.json

@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.4",
+    "version": "100.35.5",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,8 +10,8 @@
         "packages/rules-engine"
     ],
     "dependencies": {
+        "@dhis2/rules-engine-javascript": "100.35.5",
         "@dhis2/app-runtime": "^3.9.3",
-        "@dhis2/rules-engine-javascript": "100.35.4",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
         "@dhis2/d2-ui-app": "^2.0.0",

packages/rules-engine/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.4",
+    "version": "100.35.5",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js

@@ -47,11 +47,9 @@ const createApiEventQueryArgs = (
 };
 
 const createApiTEIsQueryArgs =
-({ pageSize, programId: program, orgUnitId: orgUnit }, trackedEntityIds): { [string]: any } => ({
+({ pageSize, programId: program }, trackedEntityIds): { [string]: any } => ({
     program,
     pageSize,
-    orgUnit,
-    ouMode: orgUnit ? 'SELECTED' : 'ACCESSIBLE',
     trackedEntity: trackedEntityIds,
     fields:
     'trackedEntity,createdAt,orgUnit,attributes[attribute,value],enrollments[enrollment,status,orgUnit,enrolledAt]',