fix: retrieve user locales [DHIS2-16170] (#1327)

dhis2 · Dec 12, 2023 · b4a29d1 · b4a29d1
1 parent 74121da
commit b4a29d1
Show file tree

Hide file tree

Showing 22 changed files with 2,885 additions and 423 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.40dev",
         "dhis2Username": "admin",
         "dhis2Password": "district",
         "dhis2DataTestPrefix": "",

diff --git a/...ss/fixtures/network/40/show_tiles_with_list_and_add_action_to_all_available_sections.json b/...ss/fixtures/network/40/show_tiles_with_list_and_add_action_to_all_available_sections.json
diff --git a/cypress/fixtures/network/40/static_resources.json b/cypress/fixtures/network/40/static_resources.json
diff --git a/cypress/fixtures/network/40/summary.json b/cypress/fixtures/network/40/summary.json
@@ -1,7 +1,7 @@
 {
-    "count": 339,
-    "totalResponseSize": 217662,
-    "duplicates": 265,
+    "count": 347,
+    "totalResponseSize": 223981,
+    "duplicates": 272,
     "nonDeterministicResponses": 24,
     "apiVersion": "40",
     "fixtureFiles": [

diff --git a/cypress/fixtures/network/40/the_app_has_a_main_navigation.json b/cypress/fixtures/network/40/the_app_has_a_main_navigation.json
diff --git a/cypress/fixtures/network/40/the_user_group_list_can_be_searched.json b/cypress/fixtures/network/40/the_user_group_list_can_be_searched.json
diff --git a/cypress/fixtures/network/40/the_user_list_can_be_searched.json b/cypress/fixtures/network/40/the_user_list_can_be_searched.json
diff --git a/cypress/fixtures/network/40/the_user_role_list_can_be_searched.json b/cypress/fixtures/network/40/the_user_role_list_can_be_searched.json
diff --git a/cypress/fixtures/network/40/user_groups_can_be_listed.json b/cypress/fixtures/network/40/user_groups_can_be_listed.json
diff --git a/cypress/fixtures/network/40/user_roles_can_be_listed.json b/cypress/fixtures/network/40/user_roles_can_be_listed.json
@@ -8,18 +8,18 @@
         "method": "GET",
         "requestBody": "",
         "requestHeaders": {
-            "host": "localhost:8080",
-            "proxy-connection": "keep-alive",
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
             "accept": "application/json",
             "origin": "http://localhost:3000",
-            "sec-fetch-site": "same-site",
+            "sec-fetch-site": "cross-site",
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
         "responseBody": "{\"helpPageLink\":\"https://dhis2.github.io/dhis2-docs/master/en/user/html/dhis2_user_manual_en.html\"}",
         "responseSize": 99,
         "responseHeaders": {
-            "server": "nginx/1.23.3",
+            "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
             "transfer-encoding": "chunked",
             "connection": "keep-alive",
@@ -41,18 +41,18 @@
         "method": "GET",
         "requestBody": "",
         "requestHeaders": {
-            "host": "localhost:8080",
-            "proxy-connection": "keep-alive",
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
             "accept": "application/json",
             "origin": "http://localhost:3000",
-            "sec-fetch-site": "same-site",
+            "sec-fetch-site": "cross-site",
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
         "responseBody": "{\"organisationUnits\":[{\"children\":true,\"path\":\"/ImspTQPwCqd\",\"displayName\":\"Sierra Leone\",\"id\":\"ImspTQPwCqd\"}]}",
         "responseSize": 111,
         "responseHeaders": {
-            "server": "nginx/1.23.3",
+            "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
             "transfer-encoding": "chunked",
             "connection": "keep-alive",
@@ -74,18 +74,18 @@
         "method": "GET",
         "requestBody": "",
         "requestHeaders": {
-            "host": "localhost:8080",
-            "proxy-connection": "keep-alive",
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
             "accept": "application/json",
             "origin": "http://localhost:3000",
-            "sec-fetch-site": "same-site",
+            "sec-fetch-site": "cross-site",
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
         "responseBody": "{\"pager\":{\"page\":1,\"total\":14,\"pageSize\":50,\"pageCount\":1},\"userRoles\":[{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the antenatal care program\",\"displayName\":\"Antenatal care program\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"UYXOT4A7JMI\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Child Health Program Manager\",\"displayName\":\"Child Health Program Manager\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"Ql6Gew7eaX6\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the child health program in tracker\",\"displayName\":\"Child Health Tracker\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"TMK9CMZ2V98\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Data entry clerk\",\"displayName\":\"Data entry clerk\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"Euq3XfEIEbx\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Tracker user at the facility\",\"displayName\":\"Facility tracker\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"txB7vu1w2Pr\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Read-only\",\"displayName\":\"Guest\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"XS0dNzuZmfH\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the inpatient program in tracker\",\"displayName\":\"Inpatient program\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"DRdaVRtwmG5\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"M and E Officer\",\"displayName\":\"M and E Officer\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"jRWSNIHdKww\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the MNCH program in tracker\",\"displayName\":\"MNCH / PNC (Adult Woman) program\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"aNk5AyC7ydy\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Superuser\",\"displayName\":\"Superuser\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"Ufph3mGRmMo\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"System administrator\",\"displayName\":\"System administrator (ALL)\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"LGWLyWNro4x\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the TB program in Tracker\",\"displayName\":\"TB program\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"cUlTcejWree\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"User manager\",\"displayName\":\"User manager\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"xJZBzAHI88H\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"WHO MCH program\",\"displayName\":\"WHO MCH program\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"Pqoy4DLOdMK\"}]}",
         "responseSize": 4995,
         "responseHeaders": {
-            "server": "nginx/1.23.3",
+            "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
             "transfer-encoding": "chunked",
             "connection": "keep-alive",
@@ -107,18 +107,18 @@
         "method": "GET",
         "requestBody": "",
         "requestHeaders": {
-            "host": "localhost:8080",
-            "proxy-connection": "keep-alive",
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
             "accept": "application/json",
             "origin": "http://localhost:3000",
-            "sec-fetch-site": "same-site",
+            "sec-fetch-site": "cross-site",
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
         "responseBody": "{\"pager\":{\"page\":1,\"total\":14,\"pageSize\":5,\"nextPage\":\"/40/userRoles?page=2&pageSize=5&fields=id%2CdisplayName%2Caccess%2Cuser%5Bid%2CdisplayName%5D%2CpublicAccess%2CuserGroupAccesses%2Cdescription&order=name%3Aasc\",\"pageCount\":3},\"userRoles\":[{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the antenatal care program\",\"displayName\":\"Antenatal care program\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"UYXOT4A7JMI\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Child Health Program Manager\",\"displayName\":\"Child Health Program Manager\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"Ql6Gew7eaX6\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the child health program in tracker\",\"displayName\":\"Child Health Tracker\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"TMK9CMZ2V98\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Data entry clerk\",\"displayName\":\"Data entry clerk\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"Euq3XfEIEbx\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Tracker user at the facility\",\"displayName\":\"Facility tracker\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"txB7vu1w2Pr\"}]}",
-        "responseSize": 2072,
+        "responseSize": 2082,
         "responseHeaders": {
-            "server": "nginx/1.23.3",
+            "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
             "transfer-encoding": "chunked",
             "connection": "keep-alive",
@@ -140,18 +140,18 @@
         "method": "GET",
         "requestBody": "",
         "requestHeaders": {
-            "host": "localhost:8080",
-            "proxy-connection": "keep-alive",
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
             "accept": "application/json",
             "origin": "http://localhost:3000",
-            "sec-fetch-site": "same-site",
+            "sec-fetch-site": "cross-site",
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
         "responseBody": "{\"pager\":{\"page\":2,\"total\":14,\"pageSize\":5,\"nextPage\":\"/40/userRoles?page=3&pageSize=5&fields=id%2CdisplayName%2Caccess%2Cuser%5Bid%2CdisplayName%5D%2CpublicAccess%2CuserGroupAccesses%2Cdescription&order=name%3Aasc\",\"prevPage\":\"/40/userRoles?pageSize=5&fields=id%2CdisplayName%2Caccess%2Cuser%5Bid%2CdisplayName%5D%2CpublicAccess%2CuserGroupAccesses%2Cdescription&order=name%3Aasc\",\"pageCount\":3},\"userRoles\":[{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Read-only\",\"displayName\":\"Guest\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"XS0dNzuZmfH\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the inpatient program in tracker\",\"displayName\":\"Inpatient program\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"DRdaVRtwmG5\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"M and E Officer\",\"displayName\":\"M and E Officer\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"jRWSNIHdKww\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Access to the MNCH program in tracker\",\"displayName\":\"MNCH / PNC (Adult Woman) program\",\"user\":{\"id\":\"xE7jOejl9FI\",\"code\":null,\"name\":\"John Traore\",\"displayName\":\"John Traore\",\"username\":\"admin\"},\"id\":\"aNk5AyC7ydy\"},{\"publicAccess\":\"rw------\",\"userGroupAccesses\":[],\"access\":{\"manage\":true,\"externalize\":false,\"write\":true,\"read\":true,\"update\":true,\"delete\":true},\"description\":\"Superuser\",\"displayName\":\"Superuser\",\"user\":{\"id\":\"GOLswS44mh8\",\"code\":null,\"name\":\"Tom Wakiki\",\"displayName\":\"Tom Wakiki\",\"username\":\"system\"},\"id\":\"Ufph3mGRmMo\"}]}",
-        "responseSize": 2199,
+        "responseSize": 2219,
         "responseHeaders": {
-            "server": "nginx/1.23.3",
+            "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
             "transfer-encoding": "chunked",
             "connection": "keep-alive",

diff --git a/cypress/fixtures/network/40/users_can_be_listed.json b/cypress/fixtures/network/40/users_can_be_listed.json