fix: add email field to users request [DHIS2-15354] (#1306)

dhis2 · Sep 26, 2023 · 8df3694 · 8df3694
1 parent 8d65c82
commit 8df3694
Show file tree

Hide file tree

Showing 12 changed files with 1,518 additions and 1,413 deletions.
diff --git a/cypress.json b/cypress.json
@@ -4,7 +4,7 @@
     "projectId": "48zztu",
     "experimentalInteractiveRunEvents": true,
     "env": {
-        "dhis2BaseUrl": "http://localhost:8080",
+        "dhis2BaseUrl": "https://debug.dhis2.org/2.38dev",
         "dhis2Username": "admin",
         "dhis2Password": "district",
         "dhis2DataTestPrefix": "",

diff --git a/...ss/fixtures/network/38/show_tiles_with_list_and_add_action_to_all_available_sections.json b/...ss/fixtures/network/38/show_tiles_with_list_and_add_action_to_all_available_sections.json
diff --git a/cypress/fixtures/network/38/static_resources.json b/cypress/fixtures/network/38/static_resources.json
diff --git a/cypress/fixtures/network/38/summary.json b/cypress/fixtures/network/38/summary.json
@@ -1,6 +1,6 @@
 {
     "count": 662,
-    "totalResponseSize": 770760,
+    "totalResponseSize": 861503,
     "duplicates": 514,
     "nonDeterministicResponses": 55,
     "apiVersion": "38",

diff --git a/cypress/fixtures/network/38/the_app_has_a_main_navigation.json b/cypress/fixtures/network/38/the_app_has_a_main_navigation.json
diff --git a/cypress/fixtures/network/38/the_user_group_list_can_be_searched.json b/cypress/fixtures/network/38/the_user_group_list_can_be_searched.json
diff --git a/cypress/fixtures/network/38/the_user_list_can_be_searched.json b/cypress/fixtures/network/38/the_user_list_can_be_searched.json
diff --git a/cypress/fixtures/network/38/the_user_role_list_can_be_searched.json b/cypress/fixtures/network/38/the_user_role_list_can_be_searched.json
diff --git a/cypress/fixtures/network/38/user_groups_can_be_listed.json b/cypress/fixtures/network/38/user_groups_can_be_listed.json
diff --git a/cypress/fixtures/network/38/user_roles_can_be_listed.json b/cypress/fixtures/network/38/user_roles_can_be_listed.json
diff --git a/cypress/fixtures/network/38/users_can_be_listed.json b/cypress/fixtures/network/38/users_can_be_listed.json
diff --git a/src/pages/UserList/UserList.js b/src/pages/UserList/UserList.js
@@ -32,6 +32,7 @@ const usersQuery = {
                 'id',
                 'displayName',
                 'access',
+                'email',
                 'userCredentials[username,disabled,lastLogin,twoFA]',
                 'teiSearchOrganisationUnits[id,path]',
             ],