fix: update for response format [DHIS2-17286]

dhis2 · Apr 26, 2024 · 9e2c517 · 9e2c517
1 parent 110525e
commit 9e2c517
Show file tree

Hide file tree

Showing 9 changed files with 702 additions and 34 deletions.
diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -114,7 +114,7 @@ jobs:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
                   CYPRESS_dhis2BaseUrl: http://localhost:8080
-                  CYPRESS_dhis2ApiVersion: 41
+                  CYPRESS_dhis2ApiVersion: 42
                   CYPRESS_networkMode: stub
 
     release:

diff --git a/cypress/fixtures/network/42/navigation_using_top_bar_works.json b/cypress/fixtures/network/42/navigation_using_top_bar_works.json
@@ -0,0 +1,133 @@
+[
+    {
+        "path": "/api/42/systemSettings/helpPageLink",
+        "featureName": "Navigation using top bar works",
+        "static": false,
+        "count": 3,
+        "nonDeterministic": false,
+        "method": "GET",
+        "requestBody": "",
+        "requestHeaders": {
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
+            "accept": "application/json",
+            "origin": "http://localhost:3000",
+            "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.0",
+            "content-type": "application/json;charset=UTF-8",
+            "transfer-encoding": "chunked",
+            "connection": "keep-alive",
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": "http://localhost:3000",
+            "vary": "Origin",
+            "access-control-expose-headers": "ETag, Location",
+            "cache-control": "no-cache, private",
+            "x-content-type-options": "nosniff",
+            "x-xss-protection": "1; mode=block"
+        }
+    },
+    {
+        "path": "/api/42/aggregateDataExchanges?paging=false&fields=id,displayName,created,target%5Btype%5D,source%5Brequests~size%5D,access%5Bdata%5D&order=displayName%3Aiasc",
+        "featureName": "Navigation using top bar works",
+        "static": false,
+        "count": 3,
+        "nonDeterministic": false,
+        "method": "GET",
+        "requestBody": "",
+        "requestHeaders": {
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
+            "accept": "application/json",
+            "origin": "http://localhost:3000",
+            "sec-fetch-site": "cross-site",
+            "sec-fetch-mode": "cors"
+        },
+        "statusCode": 200,
+        "responseBody": "{\"aggregateDataExchanges\":[{\"created\":\"2022-11-01T10:59:16.931\",\"source\":{\"requests\":1},\"target\":{\"type\":\"INTERNAL\"},\"displayName\":\"Internal data exchange\",\"id\":\"ioHMBgeK50L\"}]}",
+        "responseSize": 177,
+        "responseHeaders": {
+            "server": "nginx/1.23.0",
+            "content-type": "application/json;charset=UTF-8",
+            "transfer-encoding": "chunked",
+            "connection": "keep-alive",
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": "http://localhost:3000",
+            "vary": "Origin",
+            "access-control-expose-headers": "ETag, Location",
+            "cache-control": "no-cache, private",
+            "x-content-type-options": "nosniff",
+            "x-xss-protection": "1; mode=block"
+        }
+    },
+    {
+        "path": "/api/42/aggregateDataExchanges/ioHMBgeK50L?paging=false&fields=source%2C%20target,id,displayName",
+        "featureName": "Navigation using top bar works",
+        "static": false,
+        "count": 2,
+        "nonDeterministic": false,
+        "method": "GET",
+        "requestBody": "",
+        "requestHeaders": {
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
+            "accept": "application/json",
+            "origin": "http://localhost:3000",
+            "sec-fetch-site": "cross-site",
+            "sec-fetch-mode": "cors"
+        },
+        "statusCode": 200,
+        "responseBody": "{\"source\":{\"params\":{\"periodTypes\":[\"MONTHLY\",\"QUARTERLY\"]},\"requests\":[{\"name\":\"ANC\",\"dx\":[\"fbfJHSPpUQD\",\"cYeuwXTCPkU\",\"Jtf34kNZhzP\"],\"pe\":[\"LAST_12_MONTHS\",\"202201\"],\"ou\":[\"ImspTQPwCqd\"],\"filters\":[{\"dimension\":\"Bpx0589u8y0\",\"items\":[\"oRVt7g429ZO\",\"MAs88nJc9nL\"]}],\"inputIdScheme\":\"UID\",\"outputDataElementIdScheme\":\"UID\",\"outputOrgUnitIdScheme\":\"UID\",\"outputIdScheme\":\"UID\"}]},\"target\":{\"type\":\"INTERNAL\",\"request\":{\"dataElementIdScheme\":\"UID\",\"orgUnitIdScheme\":\"UID\",\"categoryOptionComboIdScheme\":\"UID\",\"idScheme\":\"UID\"}},\"displayName\":\"Internal data exchange\",\"id\":\"ioHMBgeK50L\"}",
+        "responseSize": 583,
+        "responseHeaders": {
+            "server": "nginx/1.23.0",
+            "content-type": "application/json;charset=UTF-8",
+            "transfer-encoding": "chunked",
+            "connection": "keep-alive",
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": "http://localhost:3000",
+            "vary": "Origin",
+            "access-control-expose-headers": "ETag, Location",
+            "cache-control": "no-cache, private",
+            "x-content-type-options": "nosniff",
+            "x-xss-protection": "1; mode=block"
+        }
+    },
+    {
+        "path": "/api/42/aggregateDataExchanges/ioHMBgeK50L/sourceData?paging=false&outputIdScheme=UID",
+        "featureName": "Navigation using top bar works",
+        "static": false,
+        "count": 2,
+        "nonDeterministic": false,
+        "method": "GET",
+        "requestBody": "",
+        "requestHeaders": {
+            "host": "debug.dhis2.org",
+            "connection": "keep-alive",
+            "accept": "application/json",
+            "origin": "http://localhost:3000",
+            "sec-fetch-site": "cross-site",
+            "sec-fetch-mode": "cors"
+        },
+        "statusCode": 200,
+        "responseBody": "[{\"headers\":[{\"name\":\"dx\",\"column\":\"Data\",\"valueType\":\"TEXT\",\"type\":\"java.lang.String\",\"hidden\":false,\"meta\":true},{\"name\":\"pe\",\"column\":\"Period\",\"valueType\":\"TEXT\",\"type\":\"java.lang.String\",\"hidden\":false,\"meta\":true},{\"name\":\"ou\",\"column\":\"Organisation unit\",\"valueType\":\"TEXT\",\"type\":\"java.lang.String\",\"hidden\":false,\"meta\":true},{\"name\":\"value\",\"column\":\"Value\",\"valueType\":\"NUMBER\",\"type\":\"java.lang.Double\",\"hidden\":false,\"meta\":false}],\"metaData\":{\"items\":{\"202201\":{\"name\":\"January 2022\"},\"202304\":{\"name\":\"April 2023\"},\"202305\":{\"name\":\"May 2023\"},\"202306\":{\"name\":\"June 2023\"},\"202307\":{\"name\":\"July 2023\"},\"202308\":{\"name\":\"August 2023\"},\"202309\":{\"name\":\"September 2023\"},\"202310\":{\"name\":\"October 2023\"},\"202311\":{\"name\":\"November 2023\"},\"202312\":{\"name\":\"December 2023\"},\"202401\":{\"name\":\"January 2024\"},\"202402\":{\"name\":\"February 2024\"},\"202403\":{\"name\":\"March 2024\"},\"MAs88nJc9nL\":{\"name\":\"Private Clinic\"},\"LAST_12_MONTHS\":{\"name\":\"Last 12 months\"},\"ImspTQPwCqd\":{\"name\":\"Sierra Leone\"},\"dx\":{\"name\":\"Data\"},\"pq2XI5kz2BY\":{\"name\":\"Fixed\"},\"Jtf34kNZhzP\":{\"name\":\"ANC 3rd visit\"},\"PT59n8BQbqM\":{\"name\":\"Outreach\"},\"ou\":{\"name\":\"Organisation unit\"},\"fbfJHSPpUQD\":{\"name\":\"ANC 1st visit\"},\"pe\":{\"name\":\"Period\"},\"cYeuwXTCPkU\":{\"name\":\"ANC 2nd visit\"},\"oRVt7g429ZO\":{\"name\":\"Public facilities\"},\"Bpx0589u8y0\":{\"name\":\"Facility Ownership\"}},\"dimensions\":{\"dx\":[\"fbfJHSPpUQD\",\"cYeuwXTCPkU\",\"Jtf34kNZhzP\"],\"pe\":[\"202201\",\"202304\",\"202305\",\"202306\",\"202307\",\"202308\",\"202309\",\"202310\",\"202311\",\"202312\",\"202401\",\"202402\",\"202403\"],\"ou\":[\"ImspTQPwCqd\"],\"co\":[\"pq2XI5kz2BY\",\"PT59n8BQbqM\"],\"Bpx0589u8y0\":[\"oRVt7g429ZO\",\"MAs88nJc9nL\"]}},\"rowContext\":{},\"width\":4,\"height\":36,\"rows\":[[\"cYeuwXTCPkU\",\"202304\",\"ImspTQPwCqd\",\"18076\"],[\"cYeuwXTCPkU\",\"202305\",\"ImspTQPwCqd\",\"22874\"],[\"cYeuwXTCPkU\",\"202306\",\"ImspTQPwCqd\",\"23070\"],[\"cYeuwXTCPkU\",\"202312\",\"ImspTQPwCqd\",\"14286\"],[\"fbfJHSPpUQD\",\"202308\",\"ImspTQPwCqd\",\"21050\"],[\"fbfJHSPpUQD\",\"202403\",\"ImspTQPwCqd\",\"18161\"],[\"cYeuwXTCPkU\",\"202308\",\"ImspTQPwCqd\",\"19638\"],[\"cYeuwXTCPkU\",\"202311\",\"ImspTQPwCqd\",\"18757\"],[\"cYeuwXTCPkU\",\"202310\",\"ImspTQPwCqd\",\"15541\"],[\"fbfJHSPpUQD\",\"202307\",\"ImspTQPwCqd\",\"21438\"],[\"fbfJHSPpUQD\",\"202402\",\"ImspTQPwCqd\",\"18495\"],[\"fbfJHSPpUQD\",\"202309\",\"ImspTQPwCqd\",\"21476\"],[\"cYeuwXTCPkU\",\"202307\",\"ImspTQPwCqd\",\"20329\"],[\"cYeuwXTCPkU\",\"202309\",\"ImspTQPwCqd\",\"19630\"],[\"fbfJHSPpUQD\",\"202401\",\"ImspTQPwCqd\",\"19611\"],[\"fbfJHSPpUQD\",\"202304\",\"ImspTQPwCqd\",\"18161\"],[\"fbfJHSPpUQD\",\"202305\",\"ImspTQPwCqd\",\"28226\"],[\"fbfJHSPpUQD\",\"202306\",\"ImspTQPwCqd\",\"22920\"],[\"Jtf34kNZhzP\",\"202312\",\"ImspTQPwCqd\",\"10153\"],[\"Jtf34kNZhzP\",\"202311\",\"ImspTQPwCqd\",\"14397\"],[\"Jtf34kNZhzP\",\"202310\",\"ImspTQPwCqd\",\"11407\"],[\"Jtf34kNZhzP\",\"202309\",\"ImspTQPwCqd\",\"14667\"],[\"fbfJHSPpUQD\",\"202311\",\"ImspTQPwCqd\",\"18935\"],[\"fbfJHSPpUQD\",\"202310\",\"ImspTQPwCqd\",\"17180\"],[\"fbfJHSPpUQD\",\"202312\",\"ImspTQPwCqd\",\"15281\"],[\"cYeuwXTCPkU\",\"202402\",\"ImspTQPwCqd\",\"18292\"],[\"Jtf34kNZhzP\",\"202403\",\"ImspTQPwCqd\",\"12289\"],[\"cYeuwXTCPkU\",\"202401\",\"ImspTQPwCqd\",\"16988\"],[\"Jtf34kNZhzP\",\"202304\",\"ImspTQPwCqd\",\"12250\"],[\"Jtf34kNZhzP\",\"202305\",\"ImspTQPwCqd\",\"15081\"],[\"cYeuwXTCPkU\",\"202403\",\"ImspTQPwCqd\",\"18091\"],[\"Jtf34kNZhzP\",\"202402\",\"ImspTQPwCqd\",\"11946\"],[\"Jtf34kNZhzP\",\"202307\",\"ImspTQPwCqd\",\"14260\"],[\"Jtf34kNZhzP\",\"202401\",\"ImspTQPwCqd\",\"11651\"],[\"Jtf34kNZhzP\",\"202308\",\"ImspTQPwCqd\",\"14100\"],[\"Jtf34kNZhzP\",\"202306\",\"ImspTQPwCqd\",\"15141\"]],\"headerWidth\":4}]",
+        "responseSize": 3398,
+        "responseHeaders": {
+            "server": "nginx/1.23.0",
+            "content-type": "application/json;charset=UTF-8",
+            "transfer-encoding": "chunked",
+            "connection": "keep-alive",
+            "access-control-allow-credentials": "true",
+            "access-control-allow-origin": "http://localhost:3000",
+            "vary": "Origin",
+            "access-control-expose-headers": "ETag, Location",
+            "x-content-type-options": "nosniff",
+            "x-xss-protection": "1; mode=block"
+        }
+    }
+]