Merge branch 'master' into DHIS2-14287/update-analytics-text

dhis2 · Aug 22, 2023 · 9796258 · 9796258
2 parents 1ab3a93 + 4494707
commit 9796258
Show file tree

Hide file tree

Showing 19 changed files with 680 additions and 107 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## [100.0.5](https://github.com/dhis2/data-exchange-app/compare/v100.0.4...v100.0.5) (2023-08-11)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([#64](https://github.com/dhis2/data-exchange-app/issues/64)) ([719b155](https://github.com/dhis2/data-exchange-app/commit/719b155d933dd499e0a85903b4e986899d876d8b))
+
+## [100.0.4](https://github.com/dhis2/data-exchange-app/compare/v100.0.3...v100.0.4) (2023-03-28)
+
+
+### Bug Fixes
+
+* add conflicts details [DHIS2-13936] ([#18](https://github.com/dhis2/data-exchange-app/issues/18)) ([22dad27](https://github.com/dhis2/data-exchange-app/commit/22dad273f8e9548e373e9861186ab3dea9bd5e91))
+
+## [100.0.3](https://github.com/dhis2/data-exchange-app/compare/v100.0.2...v100.0.3) (2023-03-22)
+
+
+### Bug Fixes
+
+* clean up error messages ([#19](https://github.com/dhis2/data-exchange-app/issues/19)) ([47ad829](https://github.com/dhis2/data-exchange-app/commit/47ad8299206a256a174fa680e9adee30b25f6343))
+
+## [100.0.2](https://github.com/dhis2/data-exchange-app/compare/v100.0.1...v100.0.2) (2023-02-16)
+
+
+### Bug Fixes
+
+* always use outputIdScheme=UID [DHIS2-14061] ([a3f019a](https://github.com/dhis2/data-exchange-app/commit/a3f019a89239775a34bba95fff221ca99dc191d4))
+* always use outputIdScheme=UID for data preview [DHIS2-14061] ([843d9cf](https://github.com/dhis2/data-exchange-app/commit/843d9cf0ea9684df483b1236cf2dad56a2b44da9))
+* updated cypress fixtures [DHIS2-14061] ([59fb798](https://github.com/dhis2/data-exchange-app/commit/59fb7984184c687ff461e80053bda7e25cf2c448))
+
 ## [100.0.1](https://github.com/dhis2/data-exchange-app/compare/v100.0.0...v100.0.1) (2022-11-08)
 
 

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,5 +1,5 @@
 # default code owner for repo
-*        @dhis2/team-platform
+*        @dhis2/platform-frontend
 
 # code owners for functionality
-/src/    @dhis2/team-platform @dhis2/team-qa
+/src/    @dhis2/platform-frontend @dhis2/team-qa
diff --git a/cypress/fixtures/network/40/navigation_using_top_bar_works.json b/cypress/fixtures/network/40/navigation_using_top_bar_works.json
@@ -50,8 +50,8 @@
             "sec-fetch-mode": "cors"
         },
         "statusCode": 200,
-        "responseBody": "{\"aggregateDataExchanges\":[{\"displayName\":\"Internal data exchange\",\"id\":\"ioHMBgeK50L\"},{\"displayName\":\"Multiple org units\",\"id\":\"i80vkc0aaKv\"}]}",
-        "responseSize": 144,
+        "responseBody": "{\"aggregateDataExchanges\":[{\"displayName\":\"CODE internal data exchange\",\"id\":\"o6uIAnFo7ER\"},{\"displayName\":\"Internal data exchange\",\"id\":\"ioHMBgeK50L\"}]}",
+        "responseSize": 153,
         "responseHeaders": {
             "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",
@@ -102,7 +102,7 @@
         }
     },
     {
-        "path": "/api/40/aggregateDataExchanges/ioHMBgeK50L/sourceData?paging=false",
+        "path": "/api/40/aggregateDataExchanges/ioHMBgeK50L/sourceData?paging=false&outputIdScheme=UID",
         "featureName": "Navigation using top bar works",
         "static": false,
         "count": 2,
@@ -118,8 +118,8 @@
             "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\":{\"202111\":{\"name\":\"November 2021\"},\"202112\":{\"name\":\"December 2021\"},\"202201\":{\"name\":\"January 2022\"},\"202202\":{\"name\":\"February 2022\"},\"202203\":{\"name\":\"March 2022\"},\"202204\":{\"name\":\"April 2022\"},\"202205\":{\"name\":\"May 2022\"},\"202206\":{\"name\":\"June 2022\"},\"202207\":{\"name\":\"July 2022\"},\"202208\":{\"name\":\"August 2022\"},\"202209\":{\"name\":\"September 2022\"},\"202210\":{\"name\":\"October 2022\"},\"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\":[\"202111\",\"202112\",\"202201\",\"202202\",\"202203\",\"202204\",\"202205\",\"202206\",\"202207\",\"202208\",\"202209\",\"202210\"],\"ou\":[\"ImspTQPwCqd\"],\"co\":[\"pq2XI5kz2BY\",\"PT59n8BQbqM\"],\"Bpx0589u8y0\":[\"oRVt7g429ZO\",\"MAs88nJc9nL\"]}},\"rows\":[[\"Jtf34kNZhzP\",\"202208\",\"ImspTQPwCqd\",\"14134\"],[\"Jtf34kNZhzP\",\"202207\",\"ImspTQPwCqd\",\"14303\"],[\"Jtf34kNZhzP\",\"202209\",\"ImspTQPwCqd\",\"14685\"],[\"cYeuwXTCPkU\",\"202111\",\"ImspTQPwCqd\",\"18757\"],[\"Jtf34kNZhzP\",\"202204\",\"ImspTQPwCqd\",\"13338\"],[\"Jtf34kNZhzP\",\"202203\",\"ImspTQPwCqd\",\"12289\"],[\"fbfJHSPpUQD\",\"202210\",\"ImspTQPwCqd\",\"18214\"],[\"Jtf34kNZhzP\",\"202202\",\"ImspTQPwCqd\",\"11946\"],[\"cYeuwXTCPkU\",\"202209\",\"ImspTQPwCqd\",\"19630\"],[\"cYeuwXTCPkU\",\"202208\",\"ImspTQPwCqd\",\"19658\"],[\"fbfJHSPpUQD\",\"202112\",\"ImspTQPwCqd\",\"15281\"],[\"fbfJHSPpUQD\",\"202111\",\"ImspTQPwCqd\",\"18935\"],[\"cYeuwXTCPkU\",\"202112\",\"ImspTQPwCqd\",\"14286\"],[\"Jtf34kNZhzP\",\"202205\",\"ImspTQPwCqd\",\"15081\"],[\"Jtf34kNZhzP\",\"202206\",\"ImspTQPwCqd\",\"15126\"],[\"fbfJHSPpUQD\",\"202209\",\"ImspTQPwCqd\",\"21568\"],[\"cYeuwXTCPkU\",\"202202\",\"ImspTQPwCqd\",\"18292\"],[\"cYeuwXTCPkU\",\"202201\",\"ImspTQPwCqd\",\"16988\"],[\"cYeuwXTCPkU\",\"202205\",\"ImspTQPwCqd\",\"22874\"],[\"Jtf34kNZhzP\",\"202112\",\"ImspTQPwCqd\",\"10153\"],[\"fbfJHSPpUQD\",\"202206\",\"ImspTQPwCqd\",\"22920\"],[\"Jtf34kNZhzP\",\"202111\",\"ImspTQPwCqd\",\"14397\"],[\"cYeuwXTCPkU\",\"202206\",\"ImspTQPwCqd\",\"23064\"],[\"cYeuwXTCPkU\",\"202207\",\"ImspTQPwCqd\",\"20407\"],[\"cYeuwXTCPkU\",\"202210\",\"ImspTQPwCqd\",\"18099\"],[\"fbfJHSPpUQD\",\"202207\",\"ImspTQPwCqd\",\"21708\"],[\"fbfJHSPpUQD\",\"202208\",\"ImspTQPwCqd\",\"21050\"],[\"fbfJHSPpUQD\",\"202202\",\"ImspTQPwCqd\",\"18495\"],[\"fbfJHSPpUQD\",\"202201\",\"ImspTQPwCqd\",\"19611\"],[\"Jtf34kNZhzP\",\"202201\",\"ImspTQPwCqd\",\"11651\"],[\"Jtf34kNZhzP\",\"202210\",\"ImspTQPwCqd\",\"14163\"],[\"fbfJHSPpUQD\",\"202205\",\"ImspTQPwCqd\",\"28226\"],[\"cYeuwXTCPkU\",\"202204\",\"ImspTQPwCqd\",\"19051\"],[\"fbfJHSPpUQD\",\"202203\",\"ImspTQPwCqd\",\"18161\"],[\"fbfJHSPpUQD\",\"202204\",\"ImspTQPwCqd\",\"21145\"],[\"cYeuwXTCPkU\",\"202203\",\"ImspTQPwCqd\",\"18091\"]],\"height\":36,\"headerWidth\":4,\"width\":4}]",
-        "responseSize": 3340,
+        "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\"},\"202202\":{\"name\":\"February 2022\"},\"202203\":{\"name\":\"March 2022\"},\"202204\":{\"name\":\"April 2022\"},\"202205\":{\"name\":\"May 2022\"},\"202206\":{\"name\":\"June 2022\"},\"202207\":{\"name\":\"July 2022\"},\"202208\":{\"name\":\"August 2022\"},\"202209\":{\"name\":\"September 2022\"},\"202210\":{\"name\":\"October 2022\"},\"202211\":{\"name\":\"November 2022\"},\"202212\":{\"name\":\"December 2022\"},\"202301\":{\"name\":\"January 2023\"},\"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\",\"202202\",\"202203\",\"202204\",\"202205\",\"202206\",\"202207\",\"202208\",\"202209\",\"202210\",\"202211\",\"202212\",\"202301\"],\"ou\":[\"ImspTQPwCqd\"],\"co\":[\"pq2XI5kz2BY\",\"PT59n8BQbqM\"],\"Bpx0589u8y0\":[\"oRVt7g429ZO\",\"MAs88nJc9nL\"]}},\"height\":36,\"rows\":[[\"Jtf34kNZhzP\",\"202208\",\"ImspTQPwCqd\",\"14134\"],[\"Jtf34kNZhzP\",\"202207\",\"ImspTQPwCqd\",\"14303\"],[\"Jtf34kNZhzP\",\"202209\",\"ImspTQPwCqd\",\"14685\"],[\"Jtf34kNZhzP\",\"202204\",\"ImspTQPwCqd\",\"13338\"],[\"Jtf34kNZhzP\",\"202203\",\"ImspTQPwCqd\",\"12289\"],[\"fbfJHSPpUQD\",\"202210\",\"ImspTQPwCqd\",\"18214\"],[\"Jtf34kNZhzP\",\"202202\",\"ImspTQPwCqd\",\"11946\"],[\"cYeuwXTCPkU\",\"202209\",\"ImspTQPwCqd\",\"19630\"],[\"cYeuwXTCPkU\",\"202208\",\"ImspTQPwCqd\",\"19658\"],[\"Jtf34kNZhzP\",\"202205\",\"ImspTQPwCqd\",\"15081\"],[\"Jtf34kNZhzP\",\"202206\",\"ImspTQPwCqd\",\"15126\"],[\"cYeuwXTCPkU\",\"202212\",\"ImspTQPwCqd\",\"14171\"],[\"fbfJHSPpUQD\",\"202209\",\"ImspTQPwCqd\",\"21568\"],[\"cYeuwXTCPkU\",\"202211\",\"ImspTQPwCqd\",\"15541\"],[\"cYeuwXTCPkU\",\"202202\",\"ImspTQPwCqd\",\"18292\"],[\"cYeuwXTCPkU\",\"202201\",\"ImspTQPwCqd\",\"16988\"],[\"cYeuwXTCPkU\",\"202205\",\"ImspTQPwCqd\",\"22874\"],[\"fbfJHSPpUQD\",\"202206\",\"ImspTQPwCqd\",\"22920\"],[\"cYeuwXTCPkU\",\"202206\",\"ImspTQPwCqd\",\"23064\"],[\"cYeuwXTCPkU\",\"202207\",\"ImspTQPwCqd\",\"20407\"],[\"cYeuwXTCPkU\",\"202210\",\"ImspTQPwCqd\",\"18099\"],[\"fbfJHSPpUQD\",\"202207\",\"ImspTQPwCqd\",\"21708\"],[\"fbfJHSPpUQD\",\"202208\",\"ImspTQPwCqd\",\"21050\"],[\"fbfJHSPpUQD\",\"202212\",\"ImspTQPwCqd\",\"15273\"],[\"Jtf34kNZhzP\",\"202211\",\"ImspTQPwCqd\",\"11407\"],[\"fbfJHSPpUQD\",\"202202\",\"ImspTQPwCqd\",\"18495\"],[\"fbfJHSPpUQD\",\"202201\",\"ImspTQPwCqd\",\"19611\"],[\"Jtf34kNZhzP\",\"202201\",\"ImspTQPwCqd\",\"11651\"],[\"fbfJHSPpUQD\",\"202211\",\"ImspTQPwCqd\",\"17180\"],[\"Jtf34kNZhzP\",\"202210\",\"ImspTQPwCqd\",\"14163\"],[\"Jtf34kNZhzP\",\"202212\",\"ImspTQPwCqd\",\"10113\"],[\"fbfJHSPpUQD\",\"202205\",\"ImspTQPwCqd\",\"28226\"],[\"cYeuwXTCPkU\",\"202204\",\"ImspTQPwCqd\",\"19051\"],[\"fbfJHSPpUQD\",\"202203\",\"ImspTQPwCqd\",\"18161\"],[\"fbfJHSPpUQD\",\"202204\",\"ImspTQPwCqd\",\"21145\"],[\"cYeuwXTCPkU\",\"202203\",\"ImspTQPwCqd\",\"18091\"]],\"headerWidth\":4,\"width\":4}]",
+        "responseSize": 3382,
         "responseHeaders": {
             "server": "nginx/1.23.0",
             "content-type": "application/json;charset=UTF-8",