From 085b3a3eb5e1fe67cc66d1ef741dde64dabfdc7e Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 26 Jul 2023 03:46:27 +0200 Subject: [PATCH 01/26] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/lo.po | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/i18n/lo.po b/i18n/lo.po index aff6d396ab..768265b14c 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -2,15 +2,15 @@ # Translators: # phil_dhis2, 2022 # Thuy Nguyen , 2022 -# Saysamone Sibounma, 2023 # Viktor Varland , 2023 +# Saysamone Sibounma, 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-06-27T06:20:33.460Z\n" +"POT-Creation-Date: 2023-06-01T08:11:59.116Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" -"Last-Translator: Viktor Varland , 2023\n" +"Last-Translator: Saysamone Sibounma, 2023\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,6 +69,16 @@ msgstr "Date of enrollment" msgid "Last updated" msgstr "ປັບປຸງ​ຄັ້ງຫລ້າສຸດ" +msgid "error encountered during field validation" +msgstr "" + +msgid "error" +msgstr "" + +msgid "" +"Plugins are not yet available - Please contact your system administrator" +msgstr "" + msgid "This value is validating" msgstr "" @@ -463,7 +473,7 @@ msgid "Delete" msgstr "ລົບ" msgid "Select file" -msgstr "" +msgstr "ເລືອກຟາຍ" msgid "No" msgstr "ບໍ່ແມນ" @@ -474,6 +484,12 @@ msgstr "" msgid "Select image" msgstr "" +msgid "Type to filter options" +msgstr "" + +msgid "No match found" +msgstr "" + msgid "Search" msgstr "ຄົນຫາ" @@ -803,6 +819,9 @@ msgstr "" msgid "New Enrollment in program{{escape}} {{programName}}" msgstr "" +msgid "Save {{trackedEntityTypeName}}" +msgstr "" + msgid "Save {{trackedEntityName}}" msgstr "" @@ -956,10 +975,6 @@ msgstr "" msgid "Choose a type to start searching" msgstr "" -msgid "Fill in at least {{count}} attribute to search" -msgid_plural "Fill in at least {{count}} attribute to search" -msgstr[0] "" - msgid "Search {{name}}" msgstr "" @@ -1200,22 +1215,12 @@ msgid "" "The scheduled date matches the suggested date, but can be changed if needed." msgstr "" -msgid "The scheduled date is {{count}} days {{position}} the suggested date." -msgid_plural "" -"The scheduled date is {{count}} days {{position}} the suggested date." -msgstr[0] "" - msgid "after" msgstr "" msgid "before" msgstr "" -msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgid_plural "" -"There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgstr[0] "" - msgid "" "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" @@ -1259,9 +1264,6 @@ msgstr "" msgid "Try again or contact your system administrator for support" msgstr "" -msgid "tracked entity instance" -msgstr "" - msgid "Fix errors in the form to continue." msgstr "" @@ -1274,6 +1276,9 @@ msgstr "" msgid "Edit" msgstr "ແກ້ໄຂ" +msgid "tracked entity instance" +msgstr "" + msgid "New {{ eventName }} event" msgstr "" @@ -1484,12 +1489,6 @@ msgstr "ເຖີງວັນທີ່" msgid "To time" msgstr "" -msgid "error encountered during field validation" -msgstr "" - -msgid "error" -msgstr "" - msgid "Delete polygon" msgstr "" From 74efbb546b950b3c82e9a6907857b3f0e1aac66a Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 26 Jul 2023 01:55:15 +0000 Subject: [PATCH 02/26] chore(release): cut 100.35.2 [skip release] ## [100.35.2](https://github.com/dhis2/capture-app/compare/v100.35.1...v100.35.2) (2023-07-26) ### Bug Fixes * **translations:** sync translations from transifex (master) ([085b3a3](https://github.com/dhis2/capture-app/commit/085b3a3eb5e1fe67cc66d1ef741dde64dabfdc7e)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d88ab41f9..1baaa5d22e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.35.2](https://github.com/dhis2/capture-app/compare/v100.35.1...v100.35.2) (2023-07-26) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([085b3a3](https://github.com/dhis2/capture-app/commit/085b3a3eb5e1fe67cc66d1ef741dde64dabfdc7e)) + ## [100.35.1](https://github.com/dhis2/capture-app/compare/v100.35.0...v100.35.1) (2023-07-25) diff --git a/package.json b/package.json index ba1ffcd1d5..ee1ac73ac5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.35.1", + "version": "100.35.2", "cacheVersion": "5", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.35.1", + "@dhis2/rules-engine-javascript": "100.35.2", "@dhis2/app-runtime": "^3.8.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 13092f4d03..f2bc5becec 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.35.1", + "version": "100.35.2", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 4568f0f3da3bc979a64bf3650c8e658756f2a580 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 27 Jul 2023 03:38:11 +0200 Subject: [PATCH 03/26] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/zh.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/zh.po b/i18n/zh.po index db9d95f508..0253648916 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -79,7 +79,7 @@ msgstr "错误" msgid "" "Plugins are not yet available - Please contact your system administrator" -msgstr "" +msgstr "插件尚不可用 - 请联系您的系统管理员" msgid "This value is validating" msgstr "值正在被验证" @@ -274,7 +274,7 @@ msgid "" msgstr "离开本页将丢掉你的新关系的选择" msgid "Yes, discard changes" -msgstr "" +msgstr "是的，放弃更改" msgid "No, cancel" msgstr "不，取消" @@ -376,7 +376,7 @@ msgstr "排序" msgid "" "This event has unsaved changes. Leaving this page without saving will lose " "these changes. Are you sure you want to discard unsaved changes?" -msgstr "" +msgstr "此事件有未保存的更改。离开此页面而不保存将丢失这些更改。您确定要放弃未保存的更改吗？" msgid "No events to display" msgstr "无事件可显示" @@ -589,13 +589,13 @@ msgid "Write comment" msgstr "写备注" msgid "was blanked out and hidden by your last action" -msgstr "" +msgstr "被你的最后一个动作清空并隐藏" msgid "Notice" -msgstr "" +msgstr "注意" msgid "Close the notice" -msgstr "" +msgstr "关闭通知" msgid "Use new Enrollment dashboard for {{programName}}" msgstr "为 {{programName}} 使用新的注册仪表板" @@ -825,7 +825,7 @@ msgid "New Enrollment in program{{escape}} {{programName}}" msgstr "项目{{escape}} {{programName}}的新报名" msgid "Save {{trackedEntityTypeName}}" -msgstr "" +msgstr "保存 {{trackedEntityTypeName}}" msgid "Save {{trackedEntityName}}" msgstr "保存{{trackedEntityName}}" From d663b518564405727d91e78ce8c81e8a9c00b2e7 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 27 Jul 2023 01:46:24 +0000 Subject: [PATCH 04/26] chore(release): cut 100.35.3 [skip release] ## [100.35.3](https://github.com/dhis2/capture-app/compare/v100.35.2...v100.35.3) (2023-07-27) ### Bug Fixes * **translations:** sync translations from transifex (master) ([4568f0f](https://github.com/dhis2/capture-app/commit/4568f0f3da3bc979a64bf3650c8e658756f2a580)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1baaa5d22e..56a41e016a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.35.3](https://github.com/dhis2/capture-app/compare/v100.35.2...v100.35.3) (2023-07-27) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([4568f0f](https://github.com/dhis2/capture-app/commit/4568f0f3da3bc979a64bf3650c8e658756f2a580)) + ## [100.35.2](https://github.com/dhis2/capture-app/compare/v100.35.1...v100.35.2) (2023-07-26) diff --git a/package.json b/package.json index ee1ac73ac5..b531b34137 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.35.2", + "version": "100.35.3", "cacheVersion": "5", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.35.2", + "@dhis2/rules-engine-javascript": "100.35.3", "@dhis2/app-runtime": "^3.8.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index f2bc5becec..721f78516e 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.35.2", + "version": "100.35.3", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From 343e5daa158faf257cdf1277ff8f7a3e0e5d24ec Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 1 Aug 2023 03:36:17 +0200 Subject: [PATCH 05/26] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/uz.po | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/i18n/uz.po b/i18n/uz.po index db80881838..2165735667 100644 --- a/i18n/uz.po +++ b/i18n/uz.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-06-27T06:20:33.460Z\n" +"POT-Creation-Date: 2023-06-01T08:11:59.116Z\n" "PO-Revision-Date: 2019-06-27 07:31+0000\n" "Last-Translator: Ibatov , 2023\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" @@ -72,6 +72,16 @@ msgstr "Рўйхатга киритилган сана" msgid "Last updated" msgstr "Охирги янгиланган" +msgid "error encountered during field validation" +msgstr "майдонни текшириш вақтида хатолик юз берди" + +msgid "error" +msgstr "хато" + +msgid "" +"Plugins are not yet available - Please contact your system administrator" +msgstr "" + msgid "This value is validating" msgstr "Ушбу қиймат тасдиқланмоқда" @@ -489,6 +499,12 @@ msgstr "Расм юкланмоқда" msgid "Select image" msgstr "Расмни танланг" +msgid "Type to filter options" +msgstr "" + +msgid "No match found" +msgstr "" + msgid "Search" msgstr "Излаш" @@ -827,6 +843,9 @@ msgstr "" msgid "New Enrollment in program{{escape}} {{programName}}" msgstr "" +msgid "Save {{trackedEntityTypeName}}" +msgstr "" + msgid "Save {{trackedEntityName}}" msgstr "" @@ -984,10 +1003,6 @@ msgstr "" msgid "Choose a type to start searching" msgstr "Қидирув турини танланг ва қидиришни бошланг" -msgid "Fill in at least {{count}} attribute to search" -msgid_plural "Fill in at least {{count}} attribute to search" -msgstr[0] "" - msgid "Search {{name}}" msgstr "{{name}} орқали қидириш" @@ -1125,7 +1140,7 @@ msgid "Mark as cancelled" msgstr "" msgid "Mark incomplete" -msgstr "" +msgstr "Тугалланмаган деб белгилансин" msgid "Delete enrollment" msgstr "Рўйхатдан ўтказиш ўчирилсин " @@ -1233,22 +1248,12 @@ msgid "" "The scheduled date matches the suggested date, but can be changed if needed." msgstr "" -msgid "The scheduled date is {{count}} days {{position}} the suggested date." -msgid_plural "" -"The scheduled date is {{count}} days {{position}} the suggested date." -msgstr[0] "" - msgid "after" msgstr "кейин" msgid "before" msgstr "олдин" -msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgid_plural "" -"There are {{count}} scheduled event in {{orgUnitName}} on this day." -msgstr[0] "" - msgid "" "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}" msgstr "" @@ -1292,9 +1297,6 @@ msgstr "" msgid "Try again or contact your system administrator for support" msgstr "" -msgid "tracked entity instance" -msgstr "кузатилаётган объект намунаси" - msgid "Fix errors in the form to continue." msgstr "" @@ -1308,6 +1310,9 @@ msgstr "" msgid "Edit" msgstr "Таҳрирлаш" +msgid "tracked entity instance" +msgstr "кузатилаётган объект намунаси" + msgid "New {{ eventName }} event" msgstr "" @@ -1518,12 +1523,6 @@ msgstr "Шу кунгача" msgid "To time" msgstr "Шу вақтгача" -msgid "error encountered during field validation" -msgstr "майдонни текшириш вақтида хатолик юз берди" - -msgid "error" -msgstr "хато" - msgid "Delete polygon" msgstr "Полигон (кўпбурчак) ни ўчириб ташлаш" From 06c8e03e48cbf5d6cdd267978b55577fe583404d Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Tue, 1 Aug 2023 01:43:14 +0000 Subject: [PATCH 06/26] chore(release): cut 100.35.4 [skip release] ## [100.35.4](https://github.com/dhis2/capture-app/compare/v100.35.3...v100.35.4) (2023-08-01) ### Bug Fixes * **translations:** sync translations from transifex (master) ([343e5da](https://github.com/dhis2/capture-app/commit/343e5daa158faf257cdf1277ff8f7a3e0e5d24ec)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56a41e016a..8d328d103e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.35.4](https://github.com/dhis2/capture-app/compare/v100.35.3...v100.35.4) (2023-08-01) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([343e5da](https://github.com/dhis2/capture-app/commit/343e5daa158faf257cdf1277ff8f7a3e0e5d24ec)) + ## [100.35.3](https://github.com/dhis2/capture-app/compare/v100.35.2...v100.35.3) (2023-07-27) diff --git a/package.json b/package.json index b531b34137..37b228ec1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.35.3", + "version": "100.35.4", "cacheVersion": "5", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.35.3", + "@dhis2/rules-engine-javascript": "100.35.4", "@dhis2/app-runtime": "^3.8.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 721f78516e..cbe23eb76c 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.35.3", + "version": "100.35.4", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From ef35eb300fa61343576957e6734a2767dc37b4ec Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Thu, 3 Aug 2023 20:52:08 +0200 Subject: [PATCH 07/26] fix: [DHIS2-15365] remove orgUnit and ouMode query args (#3398) --- .../teiViewEpics/helpers/getEventListData/getEventListData.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js b/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js index 6c08c91c2c..c593ff8f1f 100644 --- a/src/core_modules/capture-core/components/WorkingLists/TeiWorkingLists/epics/teiViewEpics/helpers/getEventListData/getEventListData.js +++ b/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]', From 8197a522eca36975cdd749e553a0fabd1f11a5d8 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Thu, 3 Aug 2023 19:00:14 +0000 Subject: [PATCH 08/26] chore(release): cut 100.35.5 [skip release] ## [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)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d328d103e..d6a4627eb0 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/package.json b/package.json index 37b228ec1d..4f00969968 100644 --- a/package.json +++ b/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,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.35.4", + "@dhis2/rules-engine-javascript": "100.35.5", "@dhis2/app-runtime": "^3.8.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index cbe23eb76c..908b0b2737 100644 --- a/packages/rules-engine/package.json +++ b/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": { From 20e9c23fa81716055df442faf95358671e00ab16 Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Wed, 9 Aug 2023 15:05:07 +0200 Subject: [PATCH 09/26] chore: [TECH-1616] adapt cypress tests (#3399) --- .../TeiWorkingLists/TeiWorkingListsUser/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js index db0dfacfb6..211356e1bc 100644 --- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js +++ b/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"]') From 7f262372499b98d9fd8071c7b8069238ad3a1d15 Mon Sep 17 00:00:00 2001 From: Tony Valle <79843014+superskip@users.noreply.github.com> Date: Fri, 11 Aug 2023 10:30:11 +0200 Subject: [PATCH 10/26] fix: [TECH-1623] rename TEI "Launchpad McQuack" -> "Breaking TheGlass" (#3400) --- .../EnrollmentPage/BreakingTheGlass/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js b/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js index b460d47b33..45ad92f517 100644 --- a/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js +++ b/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js @@ -1,7 +1,7 @@ import '../sharedSteps'; Given('the tei created by this test is cleared from the database', () => { - cy.buildApiUrl('tracker', 'trackedEntities?filter=w75KJ2mc4zz:like:Launchpad&filter=zDhUuAYrxNC:like:McQuack&trackedEntityType=nEenWmSyUEp&page=1&pageSize=5&ouMode=ACCESSIBLE') + cy.buildApiUrl('tracker', 'trackedEntities?filter=w75KJ2mc4zz:like:Breaking&filter=zDhUuAYrxNC:like:TheGlass&trackedEntityType=nEenWmSyUEp&page=1&pageSize=5&ouMode=ACCESSIBLE') .then(url => cy.request(url)) .then(({ body }) => body.instances.forEach(({ trackedEntity }) => @@ -24,12 +24,12 @@ And('you create a new tei in Child programme from Ngelehun CHC', () => { cy.get('[data-test="d2-form-component"]') .find('[data-test="capture-ui-input"]') .eq(0) - .type('Launchpad') + .type('Breaking') .blur(); cy.get('[data-test="d2-form-component"]') .find('[data-test="capture-ui-input"]') .eq(1) - .type('McQuack') + .type('TheGlass') .blur(); clickSave(); @@ -61,7 +61,7 @@ And('you enroll the tei from Njandama MCHP', () => { .click(); cy.get('[data-test="enrollment-page-content"]') - .contains('Enroll Launchpad McQuack in this program') + .contains('Enroll Breaking TheGlass in this program') .click(); cy.get('[data-test="d2-form-component"]') @@ -97,7 +97,7 @@ And('you log in as tracker2 user', () => { And('you select the new tei', () => { cy.visit('/#/?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW'); - cy.contains('Launchpad') + cy.contains('Breaking') .click(); // Wait for enrollment dashboard cy.get('[data-test="profile-widget"]') From 519198b0c8dc4f97f47a6dc52a1b69d71927fc35 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Fri, 11 Aug 2023 08:47:51 +0000 Subject: [PATCH 11/26] chore(release): cut 100.35.6 [skip release] ## [100.35.6](https://github.com/dhis2/capture-app/compare/v100.35.5...v100.35.6) (2023-08-11) ### Bug Fixes * [TECH-1623] rename TEI "Launchpad McQuack" -> "Breaking TheGlass" ([#3400](https://github.com/dhis2/capture-app/issues/3400)) ([7f26237](https://github.com/dhis2/capture-app/commit/7f262372499b98d9fd8071c7b8069238ad3a1d15)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6a4627eb0..c2022d7582 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [100.35.6](https://github.com/dhis2/capture-app/compare/v100.35.5...v100.35.6) (2023-08-11) + + +### Bug Fixes + +* [TECH-1623] rename TEI "Launchpad McQuack" -> "Breaking TheGlass" ([#3400](https://github.com/dhis2/capture-app/issues/3400)) ([7f26237](https://github.com/dhis2/capture-app/commit/7f262372499b98d9fd8071c7b8069238ad3a1d15)) + ## [100.35.5](https://github.com/dhis2/capture-app/compare/v100.35.4...v100.35.5) (2023-08-03) diff --git a/package.json b/package.json index 4f00969968..966c3f4c8a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "capture-app", "homepage": ".", - "version": "100.35.5", + "version": "100.35.6", "cacheVersion": "5", "serverVersion": "38", "license": "BSD-3-Clause", @@ -10,7 +10,7 @@ "packages/rules-engine" ], "dependencies": { - "@dhis2/rules-engine-javascript": "100.35.5", + "@dhis2/rules-engine-javascript": "100.35.6", "@dhis2/app-runtime": "^3.8.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/d2-icons": "^1.0.1", diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json index 908b0b2737..4d314f92cc 100644 --- a/packages/rules-engine/package.json +++ b/packages/rules-engine/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/rules-engine-javascript", - "version": "100.35.5", + "version": "100.35.6", "license": "BSD-3-Clause", "main": "./build/cjs/index.js", "scripts": { From c02c3ee46ed4209215946636682ec86c97c9d905 Mon Sep 17 00:00:00 2001 From: Simona Domnisoru Date: Tue, 15 Aug 2023 11:39:16 +0200 Subject: [PATCH 12/26] fix: [DHIS2-15525] show formNames in the enrollment dashboard (#3402) --- .../EnrollmentPageDefault/hooks/useProgramMetadata.js | 2 +- .../EnrollmentPageDefault/hooks/useProgramStages.js | 1 + .../Stages/Stage/StageDetail/hooks/useEventList.js | 4 ++-- .../components/WidgetStagesAndEvents/types/common.types.js | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js index 085a79bd15..d319df06d1 100644 --- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js +++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js @@ -8,7 +8,7 @@ const query = { id: ({ id }) => id, params: { fields: - ['programStages[id,repeatable,hideDueDate,programStageDataElements[displayInReports,dataElement[id,valueType,displayName,optionSet[options[code,name]]]'], + ['programStages[id,repeatable,hideDueDate,programStageDataElements[displayInReports,dataElement[id,valueType,displayName,displayFormName,optionSet[options[code,name]]]'], }, }, }; diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js index d146c6e3a9..3c8b50285a 100644 --- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js +++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js @@ -32,6 +32,7 @@ export const useProgramStages = (program: Program, programStages?: Array, events: const useComputeHeaderColumn = (dataElements: Array, hideDueDate: boolean, formFoundation: Object) => { const headerColumns = useMemo(() => { const dataElementHeaders = dataElements.reduce((acc, currDataElement) => { - const { id, name, type, optionSet } = currDataElement; + const { id, name, formName, type, optionSet } = currDataElement; if (!acc.find(item => item.id === id)) { if (isNotValidOptionSet(type, optionSet)) { log.error(errorCreator(MULIT_TEXT_WITH_NO_OPTIONS_SET)({ currDataElement })); return acc; } - acc.push({ id, header: name, type, sortDirection: SORT_DIRECTION.DEFAULT }); + acc.push({ id, header: formName || name, type, sortDirection: SORT_DIRECTION.DEFAULT }); } return acc; }, []); diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js index 53e97b9ebe..9ec7b002ac 100644 --- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js +++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js @@ -8,6 +8,7 @@ type StageOptions = { export type StageDataElement = { id: string, name: string, + formName: string, type: $Keys, options?: StageOptions, optionSet?: { options: Array