From 6e8b82bbbb338883358e9c69311f0b3bbbe94224 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 5 Nov 2023 02:39:09 +0100 Subject: [PATCH 01/20] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/ar.po | 47 ++++++++++------------------------- i18n/cs.po | 32 ++++++++++-------------- i18n/es.po | 32 ++++++++++-------------- i18n/fr.po | 47 ++++++++++------------------------- i18n/id.po | 47 ++++++++++------------------------- i18n/lo.po | 47 ++++++++++------------------------- i18n/nb.po | 32 ++++++++++-------------- i18n/nl.po | 47 ++++++++++------------------------- i18n/prs.po | 47 ++++++++++------------------------- i18n/ps.po | 47 ++++++++++------------------------- i18n/pt.po | 47 ++++++++++------------------------- i18n/ur.po | 47 ++++++++++------------------------- i18n/uz_UZ_Cyrl.po | 47 ++++++++++------------------------- i18n/uz_UZ_Latn.po | 47 ++++++++++------------------------- i18n/vi.po | 47 ++++++++++------------------------- i18n/zh.po | 32 ++++++++++-------------- i18n/zh_CN.po | 61 +++++++++++++++------------------------------- 17 files changed, 228 insertions(+), 525 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index ab5913c49..1f4365257 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Viktor Varland , 2023\n" "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" @@ -26,15 +26,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "تصنيف" @@ -438,9 +429,6 @@ msgstr "عنصر بيانات الحدث مطلوب" msgid "Program indicator is required" msgstr "مؤشر البرنامج مطلوب" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "الفترة مطلوبة" @@ -456,9 +444,6 @@ msgstr "عناصر بيانات الحدث" msgid "Program indicators" msgstr "مؤشرات البرنامج" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "نوع العنصر" @@ -914,12 +899,6 @@ msgstr "OSM Light" msgid "OSM Detailed" msgstr "OSM مفصل" -msgid "Google Streets" -msgstr "الشوارع بحسب غوغل" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Bing طرقات" @@ -1327,18 +1306,6 @@ msgstr "لم يتم العثور على الكيانات المتعقبة" msgid "related" msgstr "ذات صلة" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "الأحداث" - -msgid "Tracked entities" -msgstr "الكيانات المتعقبة" - -msgid "Org units" -msgstr "الوحدات التنظيمية" - msgid "not one of" msgstr "" @@ -1364,6 +1331,18 @@ msgstr "" "تتطلب هذه الطبقة حساب Google Earth Engine. تحقق من وثائق DHIS2 لمزيد من " "المعلومات." +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "الأحداث" + +msgid "Tracked entities" +msgstr "الكيانات المتعقبة" + +msgid "Org units" +msgstr "الوحدات التنظيمية" + msgid "Facility" msgstr "المنشأة" diff --git a/i18n/cs.po b/i18n/cs.po index 74f0ce52e..188c24493 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Jiří Podhorecký, 2023\n" "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n" @@ -911,12 +911,6 @@ msgstr "OSM Light" msgid "OSM Detailed" msgstr "OSM Detailed" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Bing Road" @@ -1331,18 +1325,6 @@ msgstr "Nenalezeny žádné trasované entity" msgid "related" msgstr "příbuzný" -msgid "Thematic" -msgstr "Tematický" - -msgid "Events" -msgstr "Události" - -msgid "Tracked entities" -msgstr "Trasované entity" - -msgid "Org units" -msgstr "Organizační jednotky" - msgid "not one of" msgstr "není jeden z" @@ -1368,6 +1350,18 @@ msgstr "" "Tato vrstva vyžaduje účet Google Earth Engine. Další informace najdete v " "dokumentaci DHIS2." +msgid "Thematic" +msgstr "Tematický" + +msgid "Events" +msgstr "Události" + +msgid "Tracked entities" +msgstr "Trasované entity" + +msgid "Org units" +msgstr "Organizační jednotky" + msgid "Facility" msgstr "Zařízení" diff --git a/i18n/es.po b/i18n/es.po index 68929d7f4..b9cb24364 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Janeth Cruz, 2023\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" @@ -915,12 +915,6 @@ msgstr "OSM Sencillo" msgid "OSM Detailed" msgstr "OSM Detallado" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Híbrido" - msgid "Bing Road" msgstr "Bing Carretera" @@ -1321,18 +1315,6 @@ msgstr "" msgid "related" msgstr "relacionado" -msgid "Thematic" -msgstr "Temática" - -msgid "Events" -msgstr "Eventos" - -msgid "Tracked entities" -msgstr "Entidades monitoreadas" - -msgid "Org units" -msgstr "Unidades organizativas" - msgid "not one of" msgstr "" @@ -1357,6 +1339,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "Temática" + +msgid "Events" +msgstr "Eventos" + +msgid "Tracked entities" +msgstr "Entidades monitoreadas" + +msgid "Org units" +msgstr "Unidades organizativas" + msgid "Facility" msgstr "Establecimiento" diff --git a/i18n/fr.po b/i18n/fr.po index e017cfcc8..d716b854a 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Viktor Varland , 2023\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" @@ -35,15 +35,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Classification" @@ -459,9 +450,6 @@ msgstr "L'élément de données évènement est requis" msgid "Program indicator is required" msgstr "L'indicateur de programme est requis" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "La période est requise" @@ -477,9 +465,6 @@ msgstr "Eléments de données évènement" msgid "Program indicators" msgstr "Program indicators" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Type d'élément" @@ -951,12 +936,6 @@ msgstr "OSM Light" msgid "OSM Detailed" msgstr "OSM détaillée" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybride" - msgid "Bing Road" msgstr "Bing Road" @@ -1375,18 +1354,6 @@ msgstr "Aucune entité suivie trouvée" msgid "related" msgstr "lié" -msgid "Thematic" -msgstr "Thématique" - -msgid "Events" -msgstr "Événements" - -msgid "Tracked entities" -msgstr "Entités suiviées " - -msgid "Org units" -msgstr "OrgUnit" - msgid "not one of" msgstr "ne fait pas partie de" @@ -1413,6 +1380,18 @@ msgstr "" "Cette couche nécessite un compte Google Earth Engine. Consultez la " "documentation du DHIS2 pour plus d'informations." +msgid "Thematic" +msgstr "Thématique" + +msgid "Events" +msgstr "Événements" + +msgid "Tracked entities" +msgstr "Entités suiviées " + +msgid "Org units" +msgstr "OrgUnit" + msgid "Facility" msgstr "Etablissement" diff --git a/i18n/id.po b/i18n/id.po index a6d04282a..ac32f3e22 100644 --- a/i18n/id.po +++ b/i18n/id.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Aprisa Chrysantina , 2022\n" "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n" @@ -31,15 +31,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Klasifikasi" @@ -448,9 +439,6 @@ msgstr "Item data event diperlukan" msgid "Program indicator is required" msgstr "Indikator program diperlukan" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "Periode diperlukan" @@ -466,9 +454,6 @@ msgstr "Item data event" msgid "Program indicators" msgstr "Indikator program" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Tipe item" @@ -932,12 +917,6 @@ msgstr "Cahaya OSM" msgid "OSM Detailed" msgstr "Detail OSM" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Jalan Bing" @@ -1347,18 +1326,6 @@ msgstr "Tidak ada entitas yang dilacak ditemukan" msgid "related" msgstr "terkait" -msgid "Thematic" -msgstr "Tematik" - -msgid "Events" -msgstr "Event" - -msgid "Tracked entities" -msgstr "Entitas dilacak" - -msgid "Org units" -msgstr "" - msgid "not one of" msgstr "bukan salah satu dari" @@ -1384,6 +1351,18 @@ msgstr "" "Layer ini memerlukan akun Google Earth Engine. Periksa dokumentasi DHIS2 " "untuk informasi lebih lanjut." +msgid "Thematic" +msgstr "Tematik" + +msgid "Events" +msgstr "Event" + +msgid "Tracked entities" +msgstr "Entitas dilacak" + +msgid "Org units" +msgstr "" + msgid "Facility" msgstr "" diff --git a/i18n/lo.po b/i18n/lo.po index 8555b5555..8bf9bc1bb 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Phouthasinh PHEUAYSITHIPHONE, 2023\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" @@ -27,15 +27,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -438,9 +429,6 @@ msgstr "" msgid "Program indicator is required" msgstr "" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "" @@ -456,9 +444,6 @@ msgstr "ຂໍ້ມູນລາຍບຸກຄົນ" msgid "Program indicators" msgstr "ຕົວຊີ້ວັດສະເພາະວຽກຂອງຂະແໜງ" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "" @@ -911,12 +896,6 @@ msgstr "ແຜນທີ່ແບບ OSM" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "ແຜນທີ່ຂອງ Google Streets" - -msgid "Google Hybrid" -msgstr "ແຜນທີ່ຂອງ Google Hybrid" - msgid "Bing Road" msgstr "" @@ -1317,18 +1296,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "ເຫດການ" - -msgid "Tracked entities" -msgstr "ຂໍ້ມູນບົ່ງບອກເອກະລັກທີ່ຖືກຕິດຕາມ" - -msgid "Org units" -msgstr "​ຫົວ​ໜ່ວຍ​ການ​ຈັດ​ຕັ້ງ" - msgid "not one of" msgstr "" @@ -1352,6 +1319,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "ເຫດການ" + +msgid "Tracked entities" +msgstr "ຂໍ້ມູນບົ່ງບອກເອກະລັກທີ່ຖືກຕິດຕາມ" + +msgid "Org units" +msgstr "​ຫົວ​ໜ່ວຍ​ການ​ຈັດ​ຕັ້ງ" + msgid "Facility" msgstr "ສະຖານທີ່ບໍລິການ" diff --git a/i18n/nb.po b/i18n/nb.po index 610ad9026..0f3377770 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Karoline Tufte Lien , 2023\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" @@ -903,12 +903,6 @@ msgstr "OSM tynn" msgid "OSM Detailed" msgstr "OSM Detaljert" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Bing Vei" @@ -1316,18 +1310,6 @@ msgstr "Ingen sporede enheter funnet" msgid "related" msgstr "relatert" -msgid "Thematic" -msgstr "Tematisk" - -msgid "Events" -msgstr "Hendelser" - -msgid "Tracked entities" -msgstr "Sporede enheter" - -msgid "Org units" -msgstr "Org enhet" - msgid "not one of" msgstr "ikke en av" @@ -1353,6 +1335,18 @@ msgstr "" "Dette kartlaget krever en Google Earth Engine-konto. Sjekk " "DHIS2-dokumentasjonen for mer informasjon." +msgid "Thematic" +msgstr "Tematisk" + +msgid "Events" +msgstr "Hendelser" + +msgid "Tracked entities" +msgstr "Sporede enheter" + +msgid "Org units" +msgstr "Org enhet" + msgid "Facility" msgstr "Fasilitet" diff --git a/i18n/nl.po b/i18n/nl.po index 1bb2b9344..b3f51dffe 100644 --- a/i18n/nl.po +++ b/i18n/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Charel van den Elsen, 2023\n" "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n" @@ -27,15 +27,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Classificatie" @@ -446,9 +437,6 @@ msgstr "Gegevensitem van gebeurtenis is verplicht" msgid "Program indicator is required" msgstr "Programmaindicator is verplicht" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "Periode is verplicht" @@ -464,9 +452,6 @@ msgstr "Gebeurtenisgegevensitems" msgid "Program indicators" msgstr "Programmaindicators" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Itemsoort" @@ -935,12 +920,6 @@ msgstr "OSM Light" msgid "OSM Detailed" msgstr "OSM Detailed" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Bing Road" @@ -1351,18 +1330,6 @@ msgstr "Geen getraceerde entiteiten gevonden" msgid "related" msgstr "gerelateerd" -msgid "Thematic" -msgstr "Thematisch" - -msgid "Events" -msgstr "Gebeurtenissen" - -msgid "Tracked entities" -msgstr "Getraceerde entiteiten" - -msgid "Org units" -msgstr "Organisatieëenheden" - msgid "not one of" msgstr "niet één van" @@ -1388,6 +1355,18 @@ msgstr "" "Deze laag vereist een Google Earth Engine-account. Kijk de " "DHIS2-documentation na voor meer informatie." +msgid "Thematic" +msgstr "Thematisch" + +msgid "Events" +msgstr "Gebeurtenissen" + +msgid "Tracked entities" +msgstr "Getraceerde entiteiten" + +msgid "Org units" +msgstr "Organisatieëenheden" + msgid "Facility" msgstr "Faciliteit" diff --git a/i18n/prs.po b/i18n/prs.po index 589a5eda7..6c331b6c1 100644 --- a/i18n/prs.po +++ b/i18n/prs.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Philip Larsen Donnelly, 2023\n" "Language-Team: Persian (Afghanistan) (https://app.transifex.com/hisp-uio/teams/100509/fa_AF/)\n" @@ -24,15 +24,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -435,9 +426,6 @@ msgstr "" msgid "Program indicator is required" msgstr "" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "" @@ -453,9 +441,6 @@ msgstr "د پېښې د مالوماتو (ډاټا) موضوعات" msgid "Program indicators" msgstr "د پروګرام شاخصونه" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "د نېټې ډول" @@ -908,12 +893,6 @@ msgstr "روشنی OSM" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "د ګوګل واټونه" - -msgid "Google Hybrid" -msgstr "د ګوګل هایبرېډ" - msgid "Bing Road" msgstr "" @@ -1314,18 +1293,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "پېښې" - -msgid "Tracked entities" -msgstr "" - -msgid "Org units" -msgstr "واحد های سازمان" - msgid "not one of" msgstr "" @@ -1349,6 +1316,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "پېښې" + +msgid "Tracked entities" +msgstr "" + +msgid "Org units" +msgstr "واحد های سازمان" + msgid "Facility" msgstr "سهولت" diff --git a/i18n/ps.po b/i18n/ps.po index 2c9f2c2b2..b9a95a4ea 100644 --- a/i18n/ps.po +++ b/i18n/ps.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Viktor Varland , 2023\n" "Language-Team: Pashto (https://app.transifex.com/hisp-uio/teams/100509/ps/)\n" @@ -25,15 +25,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -436,9 +427,6 @@ msgstr "" msgid "Program indicator is required" msgstr "" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "" @@ -454,9 +442,6 @@ msgstr "د پېښې د ډاټا یا مالوماتو محتویات" msgid "Program indicators" msgstr "د پروګرام شاخص" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "د اطلاعات ډول" @@ -909,12 +894,6 @@ msgstr "د OSM څراغ" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "سرک های گوگل" - -msgid "Google Hybrid" -msgstr "چندگانه گوگل" - msgid "Bing Road" msgstr "" @@ -1315,18 +1294,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "پېښې" - -msgid "Tracked entities" -msgstr "" - -msgid "Org units" -msgstr "د سازمان واحدونه" - msgid "not one of" msgstr "" @@ -1350,6 +1317,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "پېښې" + +msgid "Tracked entities" +msgstr "" + +msgid "Org units" +msgstr "د سازمان واحدونه" + msgid "Facility" msgstr "اسانتیا" diff --git a/i18n/pt.po b/i18n/pt.po index 5418b516d..3dfc09645 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: David Júnior , 2023\n" "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" @@ -30,15 +30,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Classificação" @@ -447,9 +438,6 @@ msgstr "O item de dados do evento é obrigatório" msgid "Program indicator is required" msgstr "Indicador de programa é necessário" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "Período é obrigatório" @@ -465,9 +453,6 @@ msgstr "Itens de dados do evento" msgid "Program indicators" msgstr "Indicador do programa" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Tipo de item" @@ -934,12 +919,6 @@ msgstr "Open street map lite" msgid "OSM Detailed" msgstr "Detalhado OSM" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Bing Road" @@ -1347,18 +1326,6 @@ msgstr "Nenhuma entidade rastreada encontrada" msgid "related" msgstr "Relacionado " -msgid "Thematic" -msgstr "Temático" - -msgid "Events" -msgstr "Eventos" - -msgid "Tracked entities" -msgstr "Entidades rastreadas" - -msgid "Org units" -msgstr "Unidades organizacionais" - msgid "not one of" msgstr "não um dos" @@ -1382,6 +1349,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "Temático" + +msgid "Events" +msgstr "Eventos" + +msgid "Tracked entities" +msgstr "Entidades rastreadas" + +msgid "Org units" +msgstr "Unidades organizacionais" + msgid "Facility" msgstr "Unidade sanitaria" diff --git a/i18n/ur.po b/i18n/ur.po index dee8250b6..8c0a9bc3c 100644 --- a/i18n/ur.po +++ b/i18n/ur.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Viktor Varland , 2022\n" "Language-Team: Urdu (https://app.transifex.com/hisp-uio/teams/100509/ur/)\n" @@ -25,15 +25,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -436,9 +427,6 @@ msgstr "" msgid "Program indicator is required" msgstr "" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "" @@ -454,9 +442,6 @@ msgstr "واقعہ کے اعداد و شمار کی اشیاء" msgid "Program indicators" msgstr "پروگرام اشارے" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "چیز کی قسم" @@ -909,12 +894,6 @@ msgstr "OSM لائٹ" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "" - -msgid "Google Hybrid" -msgstr "گوگل ہائبرڈ" - msgid "Bing Road" msgstr "" @@ -1315,18 +1294,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "تقریبات" - -msgid "Tracked entities" -msgstr "" - -msgid "Org units" -msgstr "" - msgid "not one of" msgstr "" @@ -1350,6 +1317,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "تقریبات" + +msgid "Tracked entities" +msgstr "" + +msgid "Org units" +msgstr "" + msgid "Facility" msgstr "" diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index bff13e30d..79f23ba13 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Ibatov , 2023\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" @@ -24,15 +24,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Таснифи" @@ -440,9 +431,6 @@ msgstr "Ҳодиса/Тадбир маълумоти элементи талаб msgid "Program indicator is required" msgstr "Дастур индикатори талаб қилинади" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "Давр талаб қилинади" @@ -458,9 +446,6 @@ msgstr "Ҳодиса/Тадбирлар ҳақида маълумот элеме msgid "Program indicators" msgstr "Дастур кўрсатгичлари" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Элемент тури" @@ -922,12 +907,6 @@ msgstr "OSM манба" msgid "OSM Detailed" msgstr "OSM Батафсил" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Йўл" @@ -1335,18 +1314,6 @@ msgstr "Ҳеч қандай кузатувдаги объект топилмад msgid "related" msgstr "боғлиқлик" -msgid "Thematic" -msgstr "Тематик" - -msgid "Events" -msgstr "Ҳодисалар" - -msgid "Tracked entities" -msgstr "Кузатувдаги объектлар" - -msgid "Org units" -msgstr "Ташкилий бўлим" - msgid "not one of" msgstr "биттаси ҳам эмас" @@ -1372,6 +1339,18 @@ msgstr "" "Ушбу қатлам учун Google Earth Engine аккаунти зарур. Қўшимча маълумот олиш " "учунDHIS2 ҳужжатларини текширинг." +msgid "Thematic" +msgstr "Тематик" + +msgid "Events" +msgstr "Ҳодисалар" + +msgid "Tracked entities" +msgstr "Кузатувдаги объектлар" + +msgid "Org units" +msgstr "Ташкилий бўлим" + msgid "Facility" msgstr "Объект" diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po index 9106249b6..cb135bcb2 100644 --- a/i18n/uz_UZ_Latn.po +++ b/i18n/uz_UZ_Latn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Yury Rogachev , 2023\n" "Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n" @@ -24,15 +24,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "Tasnifi" @@ -442,9 +433,6 @@ msgstr "Hodisa/Tadbir maʼlumoti elementi talab qilinadi" msgid "Program indicator is required" msgstr "Dastur indikatori talab qilinadi" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "Davr talab qilinadi" @@ -460,9 +448,6 @@ msgstr "Hodisalar haqida maʼlumot elementlari" msgid "Program indicators" msgstr "Dastur koʼrsatgichlari" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Element turi" @@ -930,12 +915,6 @@ msgstr "OSM manba" msgid "OSM Detailed" msgstr "OSM Batafsil" -msgid "Google Streets" -msgstr "Google Streets" - -msgid "Google Hybrid" -msgstr "Google Hybrid" - msgid "Bing Road" msgstr "Yoʼl" @@ -1343,18 +1322,6 @@ msgstr "Hech qanday kuzatuvdagi obʼekt topilmadi" msgid "related" msgstr "bogʼliqlik" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "Hodisa/tadbirlar" - -msgid "Tracked entities" -msgstr "Kuzatuvdagi obʼektlar" - -msgid "Org units" -msgstr "" - msgid "not one of" msgstr "bittasi ham emas" @@ -1380,6 +1347,18 @@ msgstr "" "Ushbu qatlam uchun Google Earth Engine akkaunti zarur. Qoʼshimcha maʼlumot " "olish uchunDHIS2 hujjatlarini tekshiring." +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "Hodisa/tadbirlar" + +msgid "Tracked entities" +msgstr "Kuzatuvdagi obʼektlar" + +msgid "Org units" +msgstr "" + msgid "Facility" msgstr "" diff --git a/i18n/vi.po b/i18n/vi.po index ba5265cf0..b05e140cf 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: Viktor Varland , 2023\n" "Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" @@ -26,15 +26,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -437,9 +428,6 @@ msgstr "" msgid "Program indicator is required" msgstr "" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "" @@ -455,9 +443,6 @@ msgstr "Mục dữ liệu sự kiện" msgid "Program indicators" msgstr "Chỉ Số Chương Trình" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "Kiểu mục" @@ -910,12 +895,6 @@ msgstr "Bản đồ ánh sáng OSM" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "Bản đồ đường phố (Google Streets)" - -msgid "Google Hybrid" -msgstr "Bản đồ thực (Google Hybrid)" - msgid "Bing Road" msgstr "" @@ -1316,18 +1295,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "Sự kiện" - -msgid "Tracked entities" -msgstr "Các thực thể được theo dõi" - -msgid "Org units" -msgstr "Các đơn vị" - msgid "not one of" msgstr "" @@ -1351,6 +1318,18 @@ msgid "" "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "Sự kiện" + +msgid "Tracked entities" +msgstr "Các thực thể được theo dõi" + +msgid "Org units" +msgstr "Các đơn vị" + msgid "Facility" msgstr "Trạm Y tế" diff --git a/i18n/zh.po b/i18n/zh.po index 8d9826663..b3343a17d 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" "Last-Translator: easylin , 2023\n" "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n" @@ -896,12 +896,6 @@ msgstr "OSM轻量" msgid "OSM Detailed" msgstr "OSM详细图" -msgid "Google Streets" -msgstr "谷歌街道" - -msgid "Google Hybrid" -msgstr "谷歌杂合" - msgid "Bing Road" msgstr "Bing道路" @@ -1302,18 +1296,6 @@ msgstr "没有找到跟踪实体" msgid "related" msgstr "相关的" -msgid "Thematic" -msgstr "专题图" - -msgid "Events" -msgstr "事件" - -msgid "Tracked entities" -msgstr "跟踪的实体" - -msgid "Org units" -msgstr "组织机构" - msgid "not one of" msgstr "不是当中一个" @@ -1337,6 +1319,18 @@ msgid "" "documentation for more information." msgstr "该层需要一个Google Earth Engine帐户。有关更多信息，请参阅DHIS2文档。" +msgid "Thematic" +msgstr "专题图" + +msgid "Events" +msgstr "事件" + +msgid "Tracked entities" +msgstr "跟踪的实体" + +msgid "Org units" +msgstr "组织机构" + msgid "Facility" msgstr "功能" diff --git a/i18n/zh_CN.po b/i18n/zh_CN.po index ff38db2a2..e7f66ed18 100644 --- a/i18n/zh_CN.po +++ b/i18n/zh_CN.po @@ -1,14 +1,14 @@ # # Translators: -# easylin , 2022 # 晓东 林 <13981924470@126.com>, 2023 +# easylin , 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n" +"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n" "PO-Revision-Date: 2019-06-25 18:35+0000\n" -"Last-Translator: 晓东 林 <13981924470@126.com>, 2023\n" +"Last-Translator: easylin , 2023\n" "Language-Team: Chinese (China) (https://app.transifex.com/hisp-uio/teams/100509/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,15 +25,6 @@ msgstr "" msgid "Failed to save map: {{message}}" msgstr "" -msgid "Calculation" -msgstr "" - -msgid "No calculations found" -msgstr "" - -msgid "Calculations can be created in the Data Visualizer app." -msgstr "" - msgid "Classification" msgstr "" @@ -320,7 +311,7 @@ msgid "Available periods are set by the source data" msgstr "" msgid "Loading periods" -msgstr "" +msgstr "载入期间" msgid "Min value is required" msgstr "" @@ -436,9 +427,6 @@ msgstr "必须提供事件数据项" msgid "Program indicator is required" msgstr "必须提供项目指标" -msgid "Calculation is required" -msgstr "" - msgid "Period is required" msgstr "需要时段" @@ -454,9 +442,6 @@ msgstr "事件数据项" msgid "Program indicators" msgstr "项目指标" -msgid "Calculations" -msgstr "" - msgid "Item type" msgstr "条目类型" @@ -748,7 +733,7 @@ msgid "" msgstr "" msgid "Use associated geometry" -msgstr "" +msgstr "使用相关的几何坐标" msgid "None (default)" msgstr "" @@ -909,12 +894,6 @@ msgstr "OSM轻量" msgid "OSM Detailed" msgstr "" -msgid "Google Streets" -msgstr "谷歌街道" - -msgid "Google Hybrid" -msgstr "谷歌杂合" - msgid "Bing Road" msgstr "" @@ -928,7 +907,7 @@ msgid "Bing Aerial Labels" msgstr "" msgid "Population" -msgstr "" +msgstr "人口" msgid "people per hectare" msgstr "" @@ -937,7 +916,7 @@ msgid "Estimated number of people living in an area." msgstr "" msgid "Population age groups" -msgstr "" +msgstr "人口年龄组" msgid "" "Estimated number of people living in an area, grouped by age and gender." @@ -1315,18 +1294,6 @@ msgstr "" msgid "related" msgstr "" -msgid "Thematic" -msgstr "" - -msgid "Events" -msgstr "事件" - -msgid "Tracked entities" -msgstr "跟踪的实体" - -msgid "Org units" -msgstr "" - msgid "not one of" msgstr "" @@ -1343,13 +1310,25 @@ msgid "No" msgstr "No" msgid "Cannot get authorization token for Google Earth Engine." -msgstr "" +msgstr "无法获取 Google 地球引擎的授权令牌。" msgid "" "This layer requires a Google Earth Engine account. Check the DHIS2 " "documentation for more information." msgstr "" +msgid "Thematic" +msgstr "" + +msgid "Events" +msgstr "事件" + +msgid "Tracked entities" +msgstr "跟踪的实体" + +msgid "Org units" +msgstr "" + msgid "Facility" msgstr "" From 146cd8d4bfdbab2613361609e80a83555c6c84e3 Mon Sep 17 00:00:00 2001 From: Adel Bensaad Date: Mon, 6 Nov 2023 10:48:36 +0000 Subject: [PATCH 02/20] chore: use reportportal fork find a launch by PR_TITLE , BRANCH_NAME and CI_BUILD_ID --- cypress.config.js | 2 +- package.json | 2 +- yarn.lock | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index 3e156464b..9c7b7fc49 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -34,7 +34,7 @@ module.exports = defineConfig({ parallel: true, debug: false, restClientConfig: { - timeout: 360000, + timeout: 660000, }, attributes: [ { diff --git a/package.json b/package.json index d4e003b4b..381faf256 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@dhis2/maps-gl": "^3.8.5", "@dhis2/ui": "^8.13.15", "@krakenjs/post-robot": "^11.0.0", - "@reportportal/agent-js-cypress": "^5.1.4", + "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop", "@reportportal/agent-js-jest": "^5.0.6", "abortcontroller-polyfill": "^1.7.5", "array-move": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 8a6df5223..ab81457db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2957,10 +2957,9 @@ "@react-hook/passive-layout-effect" "^1.2.0" "@react-hook/resize-observer" "^1.2.1" -"@reportportal/agent-js-cypress@^5.1.4": +"@reportportal/agent-js-cypress@git+https://github.com/dhis2/agent-js-cypress.git#develop": version "5.1.4" - resolved "https://registry.yarnpkg.com/@reportportal/agent-js-cypress/-/agent-js-cypress-5.1.4.tgz#43d61a6c1e954930cb4d95ad55c892467b484551" - integrity sha512-K5a6qwtnMpIO7qAUP1k4ABWmxEImO3eF9d+gdwe4SnDqeKCWB6SqC2MRt/ZcgSNlDTbYxJife5rr0f0OMg+pbA== + resolved "git+https://github.com/dhis2/agent-js-cypress.git#d3afea4e74abdbef39c1121f820f23deca2368f4" dependencies: "@reportportal/client-javascript" "^5.0.14" glob "^7.2.3" From 9fdbc7b5bb7faa856186d74c6dd946eb88a02369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 15:39:49 -0800 Subject: [PATCH 03/20] chore(deps): bump browserify-sign from 4.2.1 to 4.2.2 (#3025) Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2 - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index ab81457db..c26f37262 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4877,7 +4877,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1: +bn.js@^5.0.0, bn.js@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -5051,7 +5051,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: +browserify-rsa@^4.0.0, browserify-rsa@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== @@ -5060,19 +5060,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e" + integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg== dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.4" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.6" + readable-stream "^3.6.2" + safe-buffer "^5.2.1" browserify-zlib@~0.2.0: version "0.2.0" @@ -7034,7 +7034,7 @@ electron-to-chromium@^1.4.284: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz#953bc9a4767f5ce8ec125f9a1ad8e00e8f67e479" integrity sha512-RoDlZufvrtr2Nx3Yx5MB8jX3aHIxm8nRWPJm3yVvyHmyKaRvn90RjzB6hNnt0AkhS3IInJdyRfQb4mWhPvUjVw== -elliptic@^6.5.3: +elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -11997,7 +11997,7 @@ parents@^1.0.0, parents@^1.0.1: dependencies: path-platform "~0.11.15" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: +parse-asn1@^5.0.0, parse-asn1@^5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== @@ -13434,7 +13434,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.2.0, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.2.0, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== From 077c747357753b4297e411728975cd6b62ae0240 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 15:40:16 -0800 Subject: [PATCH 04/20] chore(deps): bump crypto-js from 4.1.1 to 4.2.0 (#3022) Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0. - [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0) --- updated-dependencies: - dependency-name: crypto-js dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c26f37262..7596c302e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6093,9 +6093,9 @@ crypto-browserify@^3.0.0: randomfill "^1.0.3" crypto-js@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" - integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== crypto-random-string@^1.0.0: version "1.0.0" From f1f21116dbd1db120319e5a522d01545d82d7bcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:20:35 -0800 Subject: [PATCH 05/20] chore(deps): bump @dhis2/maps-gl from 3.8.5 to 3.8.6 (#3020) Bumps [@dhis2/maps-gl](https://github.com/dhis2/maps-gl) from 3.8.5 to 3.8.6. - [Release notes](https://github.com/dhis2/maps-gl/releases) - [Changelog](https://github.com/dhis2/maps-gl/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/maps-gl/compare/v3.8.5...v3.8.6) --- updated-dependencies: - dependency-name: "@dhis2/maps-gl" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 381faf256..d24e106b6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@dhis2/app-service-alerts": "^3.9.4", "@dhis2/app-service-datastore": "^1.0.0-beta.3", "@dhis2/d2-i18n": "^1.1.1", - "@dhis2/maps-gl": "^3.8.5", + "@dhis2/maps-gl": "^3.8.6", "@dhis2/ui": "^8.13.15", "@krakenjs/post-robot": "^11.0.0", "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop", diff --git a/yarn.lock b/yarn.lock index 7596c302e..fd3920aa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2241,10 +2241,10 @@ markdown-it "^8.4.2" prop-types "^15.6.2" -"@dhis2/maps-gl@^3.8.5": - version "3.8.5" - resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-3.8.5.tgz#0bf52902736996093dc977b55f3626ed56aacbc1" - integrity sha512-2Pi6GtfElyJ4L9Cwl/WmxV28HT9h4euZE9XH0Pt1jhGSW108knoHXymfW9jRT1ZLk8Cwi9Xlsvv7wHzJ4nSGCQ== +"@dhis2/maps-gl@^3.8.6": + version "3.8.6" + resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-3.8.6.tgz#eace04fca9bb5d4cc24ca3fcebb4c13e3f8a6422" + integrity sha512-9jVfPczgT9MZrU/Cm5ksSjVnUV8/sPOdcaRVLj/nusDMOUVJ23Bt6/U6Gd6SOu/XPk8pWAi9dwyOF1p5pB8L7g== dependencies: "@mapbox/sphericalmercator" "^1.2.0" "@turf/area" "^6.5.0" From bcf344b2f8900566342565bc674da4602b0aa721 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Wed, 15 Nov 2023 17:08:32 -0800 Subject: [PATCH 06/20] chore: use renamed github shared workflow (#3046) --- .github/workflows/dhis2-verify-app.yml | 3 +-- .github/workflows/nightly.yml | 4 +--- cypress/integration/interpretations.cy.js | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 693d8625f..e75b52515 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -80,9 +80,8 @@ jobs: call-workflow-e2e-prod: if: "!contains(github.event.head_commit.message, '[skip ci]')" needs: [build, lint, test] - uses: dhis2/workflows/.github/workflows/analytics-e2e-tests.yml@master + uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master secrets: - baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }} username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 08035f619..8b14520f4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,10 +17,8 @@ defaults: jobs: call-workflow-e2e-dev: - if: github.ref == 'refs/heads/dev' - uses: dhis2/data-visualizer-app/.github/workflows/e2e-dev.yml@dev + uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-dev.yml@master secrets: - baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }} username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }} diff --git a/cypress/integration/interpretations.cy.js b/cypress/integration/interpretations.cy.js index 4a1e54abe..eb6d3352a 100644 --- a/cypress/integration/interpretations.cy.js +++ b/cypress/integration/interpretations.cy.js @@ -31,6 +31,8 @@ context('Interpretations', () => { Layer.openDialog('Thematic') .selectIndicatorGroup('ANC') .selectIndicator('ANC 1 Coverage') + .selectTab('Org Units') + .selectOu('Sierra Leone') .addToMap() Layer.validateDialogClosed(true) From 7d98a8abab9d71d90c2f51b1cb4eb01598661c3f Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 19 Nov 2023 02:43:04 +0100 Subject: [PATCH 07/20] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/uz_UZ_Cyrl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index 79f23ba13..b7904e238 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -314,7 +314,7 @@ msgid "Available periods are set by the source data" msgstr "" msgid "Loading periods" -msgstr "" +msgstr "Даврлар юкланмоқда" msgid "Min value is required" msgstr "" @@ -746,7 +746,7 @@ msgid "" msgstr "" msgid "Use associated geometry" -msgstr "" +msgstr "Ассоцирланган геометриядан фойдаланиш" msgid "None (default)" msgstr "" @@ -920,7 +920,7 @@ msgid "Bing Aerial Labels" msgstr "Белгилар" msgid "Population" -msgstr "" +msgstr "Аҳоли" msgid "people per hectare" msgstr "" @@ -929,7 +929,7 @@ msgid "Estimated number of people living in an area." msgstr "" msgid "Population age groups" -msgstr "" +msgstr "Аҳоли ёш гуруҳлари" msgid "" "Estimated number of people living in an area, grouped by age and gender." From dcf7743af6ddbb4c12cef377e982c1ea0f45d3c6 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 26 Nov 2023 02:43:30 +0100 Subject: [PATCH 08/20] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/uz_UZ_Cyrl.po | 212 +++++++++++++++++++++++++-------------------- 1 file changed, 116 insertions(+), 96 deletions(-) diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index b7904e238..7fd7e8ed0 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Untitled map, {{date}}" -msgstr "" +msgstr "Сарлавҳасиз харита, {{date}}" msgid "Map \"{{- name}}\" is saved." -msgstr "" +msgstr "Харита \"{{- name}}\" сақланган." msgid "Failed to save map: {{message}}" -msgstr "" +msgstr "Харитани сақлашда хатолик юз берди: {{message}}" msgid "Classification" msgstr "Таснифи" @@ -43,7 +43,7 @@ msgid "Name" msgstr "Исми" msgid "Name and value" -msgstr "" +msgstr "Номи ва қиймати" msgid "Value" msgstr "Қиймат" @@ -73,37 +73,37 @@ msgid "None" msgstr "Йўқ" msgid "Cascading" -msgstr "" +msgstr "Каскадлаш" msgid "Event location" msgstr "Ҳодиса/Тадбир ўтказиладиган жой" msgid "Enrollment location" -msgstr "" +msgstr "Рўйхатга ўтиш жойи" msgid "Tracked entity location" -msgstr "" +msgstr "Кузатов назорат жойи" msgid "Organisation unit location" -msgstr "" +msgstr "Ташкилий бирлик жойи" msgid "Fallback coordinate field" -msgstr "" +msgstr "Қайта тиклаш координата майдони" msgid "Coordinate field" msgstr "Координаталар майдони" msgid "Enrollment > event > tracked entity > org unit coordinate" -msgstr "" +msgstr "Қайд этиш> ҳолат > кузатув назорат > Ташкилий бирлик координатаси" msgid "Event > org unit coordinate" -msgstr "" +msgstr "Ҳолат > ташкилий бирлик координатаси" msgid "Event data item" msgstr "Ҳодиса/Тадбир маълумоти элементи" msgid "Selected value not available in in list: {{name}}" -msgstr "" +msgstr "Ушбу рўйхатда танланган қиймат мавжуд эмас: {{name}}" msgid "Style by data element" msgstr "Маълумот элементи бўйича услуб" @@ -180,38 +180,42 @@ msgid "Download" msgstr "Юклаш" msgid "Exit download mode" -msgstr "" +msgstr "Юклаб олиш режимидан чиқиш" msgid "Download map" msgstr "Харитани юклаш" msgid "Show map name" -msgstr "" +msgstr "Харита номини кўрсатиш" msgid "Show map description" -msgstr "" +msgstr "Харита тафсилотларини кўрсатиш" msgid "Description can be changed from File > Rename menu" -msgstr "" +msgstr "Файлда тавсифни ўзгартириш мумкин > Номини ўзгартириш менюси" msgid "" "Set the map description when you save the map or from File > Rename menu" msgstr "" +"Харитани сақлашда ёки номини ўзгартиришда харита тавсифини ўрнатинг > Номини" +" ўзгартириш менюси" msgid "Show legend" msgstr "Таърифни кўрсатиш" msgid "Show overview map" -msgstr "" +msgstr "Хаританинг умумий кўринишини кўрсатиш" msgid "Show north arrow" -msgstr "" +msgstr "Шимолий ўқни кўрсатиш" msgid "Include margins in download" -msgstr "" +msgstr "Юклаб олганда чегараларни ҳам юклаш" msgid "Resize your browser window to change the map dimensions." msgstr "" +"Харита ўлчамларини ўзгартириш учун браузерда экран созламаларини " +"ўзгартиринг." msgid "" "Map download is not supported by your browser. Try Google Chrome or Firefox." @@ -253,7 +257,7 @@ msgid "thematic" msgstr "тематик" msgid "org unit" -msgstr "" +msgstr "Ташкилий бўлим" msgid "Earth Engine" msgstr "Уйдаги механизм" @@ -271,7 +275,7 @@ msgid "Add layer" msgstr "Қатлам қўшиш" msgid "Aggregation method" -msgstr "" +msgstr "Бирлаштириш услуби" msgid "Groups" msgstr "Гуруҳлар" @@ -289,17 +293,21 @@ msgid "" "Data will be calculated on Google Earth Engine for the chosen organisation " "units." msgstr "" +"Танланган ташкилот бирликлари учун маълумотлар Google Earth Engine’да " +"ҳисоблаб чиқилади." msgid "Multiple aggregation methods are available." -msgstr "" +msgstr "Бир нечта йиғиш усуллари мавжуд" msgid "" "See the aggregation results by clicking map regions or viewing the data " "table. The results can also be downloaded." msgstr "" +"Харитада майдонларни босиш ёки маълумотлар жадвалини кўриш орқали йиғилган " +"натижаларни кўринг. натижани юклаб олиш ҳам мумкин." msgid "Unit" -msgstr "" +msgstr "Бирлик" msgid "Source" msgstr "Манба" @@ -312,24 +320,25 @@ msgstr "Йил" msgid "Available periods are set by the source data" msgstr "" +"Мавжуд муддатлар манба маълумотлари манба маълумотлари билан белгиланади" msgid "Loading periods" msgstr "Даврлар юкланмоқда" msgid "Min value is required" -msgstr "" +msgstr "Минимал қиймат сўралган" msgid "Max value is required" -msgstr "" +msgstr "Максимал қиймат сўралган" msgid "Max should be greater than min" -msgstr "" +msgstr "Максимум каттароқ бўлиши керак минимумдан" msgid "Valid steps are {{minSteps}} to {{maxSteps}}" -msgstr "" +msgstr "Яроқли босқичлар {{minSteps}} {{maxSteps}} тадан" msgid "Unit: {{ unit }}" -msgstr "" +msgstr "Бирлик: {{ unit }}" msgid "Min" msgstr "Минимум" @@ -375,7 +384,7 @@ msgid "Event status" msgstr "Ҳодиса/Тадбир ҳолати" msgid "Boundary color" -msgstr "" +msgstr "Чегара ранги" msgid "Buffer" msgstr "Буфер" @@ -385,6 +394,7 @@ msgstr "Радиус метрларда" msgid "Buffer can't be combined with associated geometry." msgstr "" +"Ассоцирланган геометрия билан буфер маълумотини комбинациялаш имконсиз" msgid "Labels" msgstr "Ёрлиқлар" @@ -393,7 +403,7 @@ msgid "Aggregation type" msgstr "Бирлаштириш тури" msgid "Only show completed events" -msgstr "" +msgstr "Фақатгина тугалланган ҳолатларни кўрсатиш" msgid "Show no data" msgstr "Маълумот йўқ" @@ -405,7 +415,7 @@ msgid "High radius" msgstr "Катта радиус" msgid "High radius should be greater than low radius" -msgstr "" +msgstr "Юқори радиус паст радиусдан каттароқ бўлиши керак" msgid "Radius should be between {{min}} and {{max}}" msgstr "Радиус {{минимум}} ва {{максимум}} оралиғида бўлиши лозим" @@ -506,10 +516,10 @@ msgid "Group set" msgstr "Гуруҳлар тўплами" msgid "Failed to load organisation unit groups." -msgstr "" +msgstr "Ташкилий бирлик гуруҳларини юклашда хатолик юз берди." msgid "Style by group set" -msgstr "" +msgstr "Гуруҳ созламалари стилидан фойдаланиш" msgid "Indicator group" msgstr "Кўрсатгич гуруҳи" @@ -571,7 +581,7 @@ msgid "Set layer opacity" msgstr "Қатлам хиралигини таҳрирланг" msgid "Toggle layer menu" -msgstr "" +msgstr "Қатлам менюсини ўзгартириш" msgid "More actions" msgstr "Бошқа ҳаракатлар" @@ -625,13 +635,13 @@ msgid "Latitude" msgstr "Кенглик" msgid "Basemap could not be added: {{message}}" -msgstr "" +msgstr "Асосий харитани қўшиб бўлмади: {{message}}" msgid "Not set" msgstr "Ўрнатилмаган" msgid "Could not retrieve event data" -msgstr "" +msgstr "Тадбир/Ҳодиса маълумотлари олинмай қолди" msgid "Organisation unit" msgstr "Ташкилий бирлик" @@ -646,15 +656,17 @@ msgid "" "Google Earth Engine failed. Is the service configured for this DHIS2 " "instance?" msgstr "" +"Google Earth Engine ишламай қолди. Хизмат ушбу DHIS2 намунаси учун " +"созланганми?" msgid "no value" msgstr "қиймат йўқ" msgid "All groups" -msgstr "" +msgstr "Барча гуруҳлар" msgid "Loading data" -msgstr "" +msgstr "Маълумотлар юкланмоқда" msgid "acres" msgstr "акр" @@ -744,18 +756,20 @@ msgid "" "This data element has too many options ({{length}}). Max options for styling" " is {{max}}." msgstr "" +"Бу маълумотлар элементида жуда кўп параметрлар мавжуд ({{length}}). " +"Стилистика учун максимал вариантлар {{max}}." msgid "Use associated geometry" msgstr "Ассоцирланган геометриядан фойдаланиш" msgid "None (default)" -msgstr "" +msgstr "Йўқ (Стандарт)" msgid "No data found for this period." msgstr "Ушбу давр учун маълумот топилмади" msgid "Image of the organisation unit" -msgstr "" +msgstr "Сурат ёки ташкилий бирлик" msgid "Code" msgstr "Код" @@ -776,7 +790,7 @@ msgid "Link" msgstr "Ҳавола" msgid "Contact" -msgstr "" +msgstr "Контакт" msgid "Email" msgstr "е-Почта" @@ -785,7 +799,7 @@ msgid "Address" msgstr "Манзил" msgid "Phone" -msgstr "" +msgstr "Телефон" msgid "ID" msgstr "ID" @@ -794,7 +808,7 @@ msgid "Comment" msgstr "Изоҳ" msgid "Organisation unit profile" -msgstr "" +msgstr "Ташкилий бирлик профили" msgid "Selected only" msgstr "Фақатгина танланган" @@ -887,19 +901,19 @@ msgid "Percentage" msgstr "Фоиз" msgid "Hectares" -msgstr "" +msgstr "Гектар" msgid "Acres" -msgstr "" +msgstr "Акр" msgid "Mean" -msgstr "" +msgstr "Англатади" msgid "Median" -msgstr "" +msgstr "Медиана" msgid "Std dev" -msgstr "" +msgstr "Стюденс" msgid "OSM Light" msgstr "OSM манба" @@ -923,10 +937,10 @@ msgid "Population" msgstr "Аҳоли" msgid "people per hectare" -msgstr "" +msgstr "Аҳоли сони, гектарда" msgid "Estimated number of people living in an area." -msgstr "" +msgstr "Ҳудудда яшовчи аҳолининг тахминий сони." msgid "Population age groups" msgstr "Аҳоли ёш гуруҳлари" @@ -934,140 +948,146 @@ msgstr "Аҳоли ёш гуруҳлари" msgid "" "Estimated number of people living in an area, grouped by age and gender." msgstr "" +"Ёши ва жинси бўйича гуруҳланган ҳудудда яшовчи одамларнинг тахминий сони." msgid "Male 0 - 1 years" -msgstr "" +msgstr "Эркак 0 - 1 ёш" msgid "Male 1 - 4 years" -msgstr "" +msgstr "Эркак 1 - 4 ёш" msgid "Male 5 - 9 years" -msgstr "" +msgstr "Эркак 5 - 9 ёш" msgid "Male 10 - 14 years" -msgstr "" +msgstr "Аёл 10 - 14 ёш" msgid "Male 15 - 19 years" -msgstr "" +msgstr "Эркак 15 - 19 ёш" msgid "Male 20 - 24 years" -msgstr "" +msgstr "Эркак 20 - 24 ёш" msgid "Male 25 - 29 years" -msgstr "" +msgstr "Эркак 25 - 29 ёш" msgid "Male 30 - 34 years" -msgstr "" +msgstr "Эркак 30 - 34 ёш" msgid "Male 35 - 39 years" -msgstr "" +msgstr "Эркак 35 - 39 ёш" msgid "Male 40 - 44 years" -msgstr "" +msgstr "Эркак 40 - 44 ёш" msgid "Male 45 - 49 years" -msgstr "" +msgstr "Эркак 45 - 49 ёш" msgid "Male 50 - 54 years" -msgstr "" +msgstr "Эркак 50 - 54 ёш" msgid "Male 55 - 59 years" -msgstr "" +msgstr "Эркак 55 - 59 ёш" msgid "Male 60 - 64 years" -msgstr "" +msgstr "Эркак 60 - 64 ёш" msgid "Male 65 - 69 years" -msgstr "" +msgstr "Эркак 65 - 69 ёш" msgid "Male 70 - 74 years" -msgstr "" +msgstr "Эркак 70 - 74 ёш" msgid "Male 75 - 79 years" -msgstr "" +msgstr "Эркак 75 - 79 ёш" msgid "Male 80 years and above" -msgstr "" +msgstr "Эркак 80 ёш ва ундан катта" msgid "Female 0 - 1 years" -msgstr "" +msgstr "Аёл 0 - 1 ёш" msgid "Female 1 - 4 years" -msgstr "" +msgstr "Аёл 1 - 4 ёш" msgid "Female 5 - 9 years" -msgstr "" +msgstr "Аёл 5 - 9 ёш" msgid "Female 10 - 14 years" -msgstr "" +msgstr "Аёл 10 - 14 ёш" msgid "Female 15 - 19 years" -msgstr "" +msgstr "Аёл 15 - 19 ёш" msgid "Female 20 - 24 years" -msgstr "" +msgstr "Аёл 20 - 24 ёш" msgid "Female 25 - 29 years" -msgstr "" +msgstr "Аёл 25 - 29 ёш" msgid "Female 30 - 34 years" -msgstr "" +msgstr "Аёл 30 - 34 ёш" msgid "Female 35 - 39 years" -msgstr "" +msgstr "Аёл 35 - 39 ёш" msgid "Female 40 - 44 years" -msgstr "" +msgstr "Аёл 40 - 44 ёш" msgid "Female 45 - 49 years" -msgstr "" +msgstr "Аёл 45 - 49 ёш" msgid "Female 50 - 54 years" -msgstr "" +msgstr "Аёл 50 - 54 ёш" msgid "Female 55 - 59 years" -msgstr "" +msgstr "Аёл 55 - 59 ёш" msgid "Female 60 - 64 years" -msgstr "" +msgstr "Аёл 60 - 64 ёш" msgid "Female 65 - 69 years" -msgstr "" +msgstr "Аёл 65 - 69 ёш" msgid "Female 70 - 74 years" -msgstr "" +msgstr "Аёл 70 - 74 ёш" msgid "Female 75 - 79 years" -msgstr "" +msgstr "Аёл 75 - 79 ёш" msgid "Female 80 years and above" -msgstr "" +msgstr "Аёл 80 ёш ва ундан катта" msgid "Building footprints" -msgstr "" +msgstr "Бино чизмалари" msgid "Number of buildings" -msgstr "" +msgstr "Бино рақамлари" msgid "" "The outlines of buildings derived from high-resolution satellite imagery. " "Only for the continent of Africa." msgstr "" +"Юқори аниқликдаги сунъий йўлдош тасвирларидан олинган биноларнинг " +"контурлари. Фақат Африка қитъаси учун." msgid "" "Building counts are only available for smaller organisation unit areas." msgstr "" +"Биноларни санаш фақат кичикроқ ташкилий бирликлар ҳудудлари учун мавжуд." msgid "" "Select a smaller area or single organization unit to see the count of " "buildings." msgstr "" +"Бинолар сонини кўриш учун кичикроқ майдон ёки битта ташкилий бирликни " +"танланг." msgid "Elevation" msgstr "Баландлик" msgid "meters" -msgstr "" +msgstr "метр" msgid "Elevation above sea-level." msgstr "Денгиз сатҳидан баландлик" @@ -1261,25 +1281,25 @@ msgid "Cancelled" msgstr "Бекор қилинди" msgid "{{name}}: No coordinates found" -msgstr "" +msgstr "{{name}}: Координаталар аниқланмади" msgid "Selected org units: No coordinates found" -msgstr "" +msgstr "Танланган ташкилий бирлик: Координаталар аниқланмади" msgid "Error: {{message}}" -msgstr "" +msgstr "Хатолик: {{message}}" msgid "You don't have access to this layer data" msgstr "Ушбу қатлам маълумотларига кириш ҳуқуқига эга эмассиз" msgid "The event filter is not supported" -msgstr "" +msgstr "Ҳодиса фильтри қўллаб қувватланмайди" msgid "An unknown error occurred while reading layer data" msgstr "Қатлам маълумотларини ўқиш пайтида номаълум хатолик юз берди" msgid "Displaying first {{pageSize}} events out of {{total}}" -msgstr "" +msgstr "Биринчиси кўрсатилмоқда {{pageSize}} та ҳодисадан {{total}}" msgid "No data found" msgstr "Маълумотлар топилмади" @@ -1291,7 +1311,7 @@ msgid "Facilities" msgstr "Муассасалар" msgid "Facilities: No coordinates found" -msgstr "" +msgstr "Ташкилот: Координаталар аниқланмади" msgid "Organisation units" msgstr "Ташкилий бўлимлар" @@ -1330,7 +1350,7 @@ msgid "No" msgstr "Йўқ" msgid "Cannot get authorization token for Google Earth Engine." -msgstr "" +msgstr "Google Earth Engine учун авторизация токенини олиш имконсиз" msgid "" "This layer requires a Google Earth Engine account. Check the DHIS2 " From a60d7730b33fe0e50729e8f4b59a3028c8762280 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Fri, 8 Dec 2023 12:58:38 +0100 Subject: [PATCH 09/20] chore: use more verbose style in LayersLoader to clarify logic (#3075) This code was hard to understand because of the double-negatives and multiple clauses in this statement. Refactored it to a more verbose style. The logic is the same: you can run the tests on the old code and it will pass. --- src/components/loaders/LayersLoader.js | 24 +++- .../loaders/__tests__/LayersLoader.spec.js | 106 ++++++++++++++++++ .../__snapshots__/LayersLoader.spec.js.snap | 25 +++++ 3 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 src/components/loaders/__tests__/LayersLoader.spec.js create mode 100644 src/components/loaders/__tests__/__snapshots__/LayersLoader.spec.js.snap diff --git a/src/components/loaders/LayersLoader.js b/src/components/loaders/LayersLoader.js index 5db7623c7..b703672a1 100644 --- a/src/components/loaders/LayersLoader.js +++ b/src/components/loaders/LayersLoader.js @@ -5,11 +5,25 @@ import LayerLoader from './LayerLoader.js' const LayersLoader = () => { const layers = useSelector((state) => - state.map.mapViews.filter( - (layer) => - !layer.isLoading && - (!layer.isLoaded || (layer.showDataTable && !layer.isExtended)) - ) + state.map.mapViews.filter((layer) => { + // The layer is currently being loaded - don't load again + if (layer.isLoading) { + return false + } else { + // The layer is not loaded - load it + if (!layer.isLoaded) { + return true + } + + // The layer is loaded but the data table is now displayed and + // event extended data hasn't been loaded yet - so load it + if (layer.showDataTable && !layer.isExtended) { + return true + } + + return false + } + }) ) const dispatch = useDispatch() diff --git a/src/components/loaders/__tests__/LayersLoader.spec.js b/src/components/loaders/__tests__/LayersLoader.spec.js new file mode 100644 index 000000000..f9d933a89 --- /dev/null +++ b/src/components/loaders/__tests__/LayersLoader.spec.js @@ -0,0 +1,106 @@ +import { render } from '@testing-library/react' +import React from 'react' +import { Provider } from 'react-redux' +import configureMockStore from 'redux-mock-store' +import LayersLoader from '../LayersLoader.js' + +const mockStore = configureMockStore() + +jest.mock( + '../LayerLoader.js', + () => + function MockLayerLoader() { + return
LayerLoader
+ } +) + +const testCases = [ + { + testTitle: 'renders 0 layers if no layers', + store: { + map: { + mapViews: [], + }, + }, + }, + { + testTitle: 'renders 0 layers if currently loading the layer', + store: { + map: { + mapViews: [{ isLoading: true, isLoaded: false }], + }, + }, + }, + { + testTitle: + 'renders 0 layers if currently loading regardless of whether loaded already', + store: { + map: { + mapViews: [ + { + isLoading: true, + isLoaded: true, + }, + ], + }, + }, + }, + { + testTitle: 'renders 1 layer if not currently loading and not loaded', + store: { + map: { + mapViews: [ + { + isLoading: false, + isLoaded: false, + }, + ], + }, + }, + }, + { + testTitle: + 'renders 1 layer if not currently loading and is loaded but need extended data', + store: { + map: { + mapViews: [ + { + isLoading: false, + isLoaded: true, + showDataTable: true, + isExtended: false, + }, + ], + }, + }, + }, + { + testTitle: + 'renders 0 layers if not currently loading and loaded and extended data also loaded', + store: { + map: { + mapViews: [ + { + isLoading: false, + isLoaded: true, + showDataTable: true, + isExtended: true, + }, + ], + }, + }, + }, +] + +describe('LayersLoader', () => { + testCases.forEach(({ testTitle, store }) => { + test(testTitle, () => { + const { container } = render( + + + + ) + expect(container).toMatchSnapshot() + }) + }) +}) diff --git a/src/components/loaders/__tests__/__snapshots__/LayersLoader.spec.js.snap b/src/components/loaders/__tests__/__snapshots__/LayersLoader.spec.js.snap new file mode 100644 index 000000000..90197f2b9 --- /dev/null +++ b/src/components/loaders/__tests__/__snapshots__/LayersLoader.spec.js.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`LayersLoader renders 0 layers if currently loading regardless of whether loaded already 1`] = `
`; + +exports[`LayersLoader renders 0 layers if currently loading the layer 1`] = `
`; + +exports[`LayersLoader renders 0 layers if no layers 1`] = `
`; + +exports[`LayersLoader renders 0 layers if not currently loading and loaded and extended data also loaded 1`] = `
`; + +exports[`LayersLoader renders 1 layer if not currently loading and is loaded but need extended data 1`] = ` +
+
+ LayerLoader +
+
+`; + +exports[`LayersLoader renders 1 layer if not currently loading and not loaded 1`] = ` +
+
+ LayerLoader +
+
+`; From ef72d0685628665913558389914b27c9043c77c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Thu, 14 Dec 2023 16:19:12 +0100 Subject: [PATCH 10/20] chore: analytics@26.2.0 (#3081) * chore: 26.2.0-cumulative-values-alpha.1 * chore: analytics@26.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d24e106b6..a6f7511c5 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "start-server-and-test": "^2.0.1" }, "dependencies": { - "@dhis2/analytics": "^26.0.17", + "@dhis2/analytics": "^26.2.0", "@dhis2/app-runtime": "^3.9.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-alerts": "^3.9.4", diff --git a/yarn.lock b/yarn.lock index fd3920aa3..cd5379592 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2015,10 +2015,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.0.17": - version "26.0.17" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.17.tgz#f6f550c266478c38872429ee422f6a890b189a82" - integrity sha512-681OmaLrAetgHL59iU9ldeaXZ7NLp5T3nWLxGQGAklUwCpmny32wJKj2aXsCQN6WYuGDvz9PgpqN+YrkAMChFQ== +"@dhis2/analytics@^26.2.0": + version "26.2.0" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.2.0.tgz#36a7f258ac96ddab90f4001e62257e2cc64f202e" + integrity sha512-YcJu6EHnor6pbHmwXKYumLRVy/9TxuLtBDv9JIzjt9/APZa8kbak6sT2/53pnWDnbUjzDwR8EV1UIz24vAX+ig== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From 321089bc43004505103dcb5b8810bc4ef60ce966 Mon Sep 17 00:00:00 2001 From: Adel Bensaad Date: Tue, 19 Dec 2023 09:08:26 +0100 Subject: [PATCH 11/20] test: send jest test results only when env is setup (#3078) * test: send jest test results only when env is setup not push the test results to report portal when running the test locally * chore: use hyphens for app names * test: add report portal attributes BRANCH_NAME CI_BUILD_ID PR_TITLE to easily identify jest tests runs in report portal --------- Co-authored-by: Jen Jones Arnesen --- .github/workflows/dhis2-verify-app.yml | 3 ++ cypress.config.js | 2 +- jest.config.js | 69 ++++++++++++++++---------- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index e75b52515..d5a0d2598 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -76,6 +76,9 @@ jobs: REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }} REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }} REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }} + CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }} + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + PR_TITLE: ${{ github.event.pull_request.title }} call-workflow-e2e-prod: if: "!contains(github.event.head_commit.message, '[skip ci]')" diff --git a/cypress.config.js b/cypress.config.js index 9c7b7fc49..43a62ced8 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -43,7 +43,7 @@ module.exports = defineConfig({ }, { key: 'app_name', - value: 'maps_app', + value: 'maps-app', }, { key: 'test_level', diff --git a/jest.config.js b/jest.config.js index 5d81b0b52..6faa4a75e 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,3 +1,46 @@ +const reportPortalConfig = [ + '@reportportal/agent-js-jest', + { + apiKey: process.env.REPORTPORTAL_API_KEY, + endpoint: process.env.REPORTPORTAL_ENDPOINT, + project: process.env.REPORTPORTAL_PROJECT, + launch: 'maps_app', + attributes: [ + { + key: 'dhis2_version', + value: 'master', + }, + { + key: 'app_name', + value: 'maps-app', + }, + { + key: 'test_level', + value: 'unit/integration', + }, + { + key: 'BRANCH_NAME', + value: process.env.BRANCH_NAME, + }, + { + key: 'CI_BUILD_ID', + value: process.env.CI_BUILD_ID, + }, + { + key: 'PR_TITLE', + value: process.env.PR_TITLE, + }, + ], + description: '', + debug: true, + }, +] + +const isReportPortalSetup = + process.env.REPORTPORTAL_API_KEY !== undefined && + process.env.REPORTPORTAL_ENDPOINT !== undefined && + process.env.REPORTPORTAL_PROJECT !== undefined + module.exports = { setupFilesAfterEnv: ['/config/testSetup.js'], collectCoverageFrom: ['src/**/*.js'], @@ -14,30 +57,6 @@ module.exports = { testRunner: 'jest-circus/runner', reporters: [ 'default', - [ - '@reportportal/agent-js-jest', - { - apiKey: process.env.REPORTPORTAL_API_KEY, - endpoint: process.env.REPORTPORTAL_ENDPOINT, - project: process.env.REPORTPORTAL_PROJECT, - launch: 'maps_app', - attributes: [ - { - key: 'version', - value: 'master', - }, - { - key: 'app_name', - value: 'maps_app', - }, - { - key: 'test_level', - value: 'unit/integration', - }, - ], - description: '', - debug: true, - }, - ], + ...(isReportPortalSetup ? [reportPortalConfig] : []), ], } From 8a1ae3051d294ffe931b91085efcf7539587ce8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 14:23:12 +0100 Subject: [PATCH 12/20] chore(deps-dev): bump @dhis2/cli-app-scripts from 10.3.10 to 10.3.11 (#3083) Bumps [@dhis2/cli-app-scripts](https://github.com/dhis2/app-platform/tree/HEAD/cli) from 10.3.10 to 10.3.11. - [Release notes](https://github.com/dhis2/app-platform/releases) - [Changelog](https://github.com/dhis2/app-platform/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/app-platform/commits/v10.3.11/cli) --- updated-dependencies: - dependency-name: "@dhis2/cli-app-scripts" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index a6f7511c5..8ae5b6a2f 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "postinstall": "patch-package" }, "devDependencies": { - "@dhis2/cli-app-scripts": "^10.3.10", + "@dhis2/cli-app-scripts": "^10.3.11", "@dhis2/cli-style": "^10.5.1", "@dhis2/cypress-commands": "^10.0.3", "@dhis2/cypress-plugins": "^10.0.3", diff --git a/yarn.lock b/yarn.lock index cd5379592..fbaee7edb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2036,12 +2036,12 @@ react-beautiful-dnd "^10.1.1" resize-observer-polyfill "^1.5.1" -"@dhis2/app-adapter@10.3.10": - version "10.3.10" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.10.tgz#31e8bc93cdb3793db412707cdaf6f2d086c06d39" - integrity sha512-YjFrCq3s8+jPoycMacezM9nMd63C+Lcbzf9Lnu1zlJlHMSjVUTZ8nbWEqy1WQUR6vvWIZ+0DWGw1PPzDJNViog== +"@dhis2/app-adapter@10.3.11": + version "10.3.11" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.11.tgz#a5322deba404fb405f80925684d7a5d9cdc48c81" + integrity sha512-H36P1tqSuzMyu4/uxSVFsEIXrWXzqVG1NPtANY+xEJcmrOoXH7YuiKvJu/Dl4rINDkERuUM+GwWMMgfBuMmrUw== dependencies: - "@dhis2/pwa" "10.3.10" + "@dhis2/pwa" "10.3.11" moment "^2.24.0" "@dhis2/app-runtime-adapter-d2@^1.1.0": @@ -2098,15 +2098,15 @@ dependencies: lodash "^4.17.21" -"@dhis2/app-shell@10.3.10": - version "10.3.10" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.10.tgz#b8511fc52a97c40f0919c8f632cfda5edd664340" - integrity sha512-14FbdP+8Q657572LBU7zxVnTxB1cxD837k9n5ir6GKeb9Obw4KzdN2tTBA2Ll76iL83WjxcdzmAEiE6jSXCjyw== +"@dhis2/app-shell@10.3.11": + version "10.3.11" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.11.tgz#461a19159ae6938e705ab793005403327b1ad95b" + integrity sha512-DCEOFK5i2/oNOOz33SqQ/7J3LJN0zUYMukdS/arEQCR9zP4bs+1yHGNRXtv8XoQRiYzdlIXsimlZzOm1ZDsxTw== dependencies: - "@dhis2/app-adapter" "10.3.10" + "@dhis2/app-adapter" "10.3.11" "@dhis2/app-runtime" "^3.9.0" "@dhis2/d2-i18n" "^1.1.1" - "@dhis2/pwa" "10.3.10" + "@dhis2/pwa" "10.3.11" "@dhis2/ui" "^8.12.3" classnames "^2.2.6" moment "^2.29.1" @@ -2119,10 +2119,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^10.3.10": - version "10.3.10" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.10.tgz#864d7ef7bcd2ba7f1f494c0b0d130edfda87360a" - integrity sha512-b0lZIIbV3LaiOvx5ptBLBjg+qFZCgOLJbNBvdaGLaOJAGU2QHGffcOsZvGBWYcQ6ipn+o0O1AFpuo9FFIY7EkQ== +"@dhis2/cli-app-scripts@^10.3.11": + version "10.3.11" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.11.tgz#024920726eb9a9057fa1f73d745b9a75b5d55b7e" + integrity sha512-j7fetbmlSSHdGz9YlGJMaKyLzfEGWnOoaKvi53UfI0e3k7EIBbc9YTLH6qoYJX4KvvXNjB9ICNjvTFEjWHeIZw== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -2131,7 +2131,7 @@ "@babel/preset-env" "^7.14.7" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "10.3.10" + "@dhis2/app-shell" "10.3.11" "@dhis2/cli-helpers-engine" "^3.2.0" "@jest/core" "^27.0.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4" @@ -2282,10 +2282,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ== -"@dhis2/pwa@10.3.10": - version "10.3.10" - resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.10.tgz#2d00f06dbc1dac060d3d4b4096c4f5b7651fbc54" - integrity sha512-MBLySNo02SIXP/aHKvTvdan2/Fx3nyBhddwi3HzZFfc2LQ7/oHLLE+SvOL8JtTAet13GEu4chYyzIe3JvTzgDw== +"@dhis2/pwa@10.3.11": + version "10.3.11" + resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.11.tgz#6eb5a692fe92a56bd6ffa56f06322617c15968dc" + integrity sha512-nHQhNDe0MTEG3/YcdBDcGD6NwcDoDKUyJWbtC8xErEKbHIns0HWjhIC+NPMrVu3NxEv1HZiHupK9lnfzPVJC4Q== dependencies: idb "^6.0.0" workbox-core "^6.1.5" From f7b1e9b8b22ca07b74039b3795f3cfbf762954da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:45:47 +0100 Subject: [PATCH 13/20] chore(deps): bump @dhis2/ui from 8.13.15 to 8.16.0 (#3074) * chore(deps): bump @dhis2/ui from 8.13.15 to 8.16.0 Bumps [@dhis2/ui](https://github.com/dhis2/ui/tree/HEAD/collections/ui) from 8.13.15 to 8.16.0. - [Release notes](https://github.com/dhis2/ui/releases) - [Changelog](https://github.com/dhis2/ui/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/ui/commits/v8.16.0/collections/ui) --- updated-dependencies: - dependency-name: "@dhis2/ui" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * chore: test updates that decouple test to ui version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- .../DataDownloadDialogActions.spec.js | 24 +- .../DataDownloadDialogActions.spec.js.snap | 62 +- yarn.lock | 850 +++++++++--------- 4 files changed, 463 insertions(+), 475 deletions(-) diff --git a/package.json b/package.json index 8ae5b6a2f..d5f1ff205 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@dhis2/app-service-datastore": "^1.0.0-beta.3", "@dhis2/d2-i18n": "^1.1.1", "@dhis2/maps-gl": "^3.8.6", - "@dhis2/ui": "^8.13.15", + "@dhis2/ui": "^8.16.0", "@krakenjs/post-robot": "^11.0.0", "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop", "@reportportal/agent-js-jest": "^5.0.6", diff --git a/src/components/layers/download/__tests__/DataDownloadDialogActions.spec.js b/src/components/layers/download/__tests__/DataDownloadDialogActions.spec.js index 334915b71..cf19424d6 100644 --- a/src/components/layers/download/__tests__/DataDownloadDialogActions.spec.js +++ b/src/components/layers/download/__tests__/DataDownloadDialogActions.spec.js @@ -2,8 +2,28 @@ import { render } from '@testing-library/react' import React from 'react' import DataDownloadDialogActions from '../DataDownloadDialogActions.js' +/* eslint-disable react/prop-types */ +jest.mock('@dhis2/ui', () => { + const originalModule = jest.requireActual('@dhis2/ui') + + return { + __esModule: true, + ...originalModule, + Button: function Mock({ children }) { + return
{children}
+ }, + ButtonStrip: function Mock({ children }) { + return
{children}
+ }, + CircularLoader: function Mock({ children }) { + return
{children}
+ }, + } +}) +/* eslint-enable react/prop-types */ + describe('DataDownloadDialogActions', () => { - it('Should render two buttons and NO loading spinner', () => { + it('Should render two buttons and NO loading spinner when not loading', () => { const { container } = render( { expect(container).toMatchSnapshot() }) - it('Should disable buttons and show loading spinner when loading', () => { + it('Should render two buttons and show loading spinner when loading', () => { const { container } = render(
- + Cancel
- + Download
`; -exports[`DataDownloadDialogActions Should render two buttons and NO loading spinner 1`] = ` +exports[`DataDownloadDialogActions Should render two buttons and show loading spinner when loading 1`] = `
- + Cancel
- + Download +
diff --git a/yarn.lock b/yarn.lock index fbaee7edb..23d87bf60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1435,583 +1435,583 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@dhis2-ui/alert@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.13.15.tgz#5f9a9665e751bc94d96b1d2993683731ac63c019" - integrity sha512-6KiE4TGaJC3FdChyc5FvghInSlPl4hZNDjukq5lYy0XXgnaKBSz9yUPmod5+NLHFsEr0DCISBKFhVeKAexz/hg== +"@dhis2-ui/alert@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.16.0.tgz#589b8243b3d6133d1f2b226ac9dc9df0803f5872" + integrity sha512-PfuSxm5K+xxbPVZU82L0U26KMbOdNx+sFFLMEWHukDhCSuja7zp64EzkX0iT/KfDBHBdbxF9G9fwyATA84Dnlg== dependencies: - "@dhis2-ui/portal" "8.13.15" + "@dhis2-ui/portal" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/box@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.13.15.tgz#fb8fce7ee20e27b9e25e7a294c1109a881b123a4" - integrity sha512-SwzPGXbySpU/e0lJyxOfxXipFAc3C9GKKsSQYKVOo2/kxwZDui9zaUcw1hCv4rK4vy2hB1b2GLEvJLnQAE3VIQ== +"@dhis2-ui/box@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.16.0.tgz#23741e67254e1b48dd9bebfe726e8a2f1b407e3e" + integrity sha512-vrKNXC03ZUAUL0YaAa43XhHpCSMNTn4Fu4GUmzQg0Jb+3ALp4+D+WBQzVWaZYMSqesDiOPS1ZB4z65QUMAAawQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/button@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.13.15.tgz#0bcb2365a9dd200c303b4bea003a5b403382c981" - integrity sha512-rzHPLBAbG6Q0k8JZU21eWABa/+GqOvl9WV6ay8ODahJmvauOpKKNOYn2AfUZEjbwrWgVbiuGhPOvnC+bVI+jDw== +"@dhis2-ui/button@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.16.0.tgz#f78b7dffcb3414fa8210db1b9d62c9414d6544ba" + integrity sha512-YCsNgRzCoazZ1RjmJUckACqy4iL76wOJoFMRnP+7AzOFU8myEFZakPnihR6dxsjxSCTsQTBebRMmmGRNp259wg== dependencies: - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/popper" "8.13.15" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/popper" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/calendar@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.13.15.tgz#d37395674df24565258d76aa6f771f76801c8adb" - integrity sha512-/2FVtXI6vGQlFvPul3I/EdWJfpo3QXx5aF/YKZVEEQaM5nhVmdLMVqNoIvNGzh1PJsAyrc6JhqdqqbK5AO2u0w== +"@dhis2-ui/calendar@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.16.0.tgz#3c64736ddb87195699c9db3219b2b2e56345b3fc" + integrity sha512-B+EI/t9r1Ed8XQ3dNmnZl/NSXiee4IV9DpNcCIwOV6K9OZ23/zt1L4QaRjI7u3/F5JeguxRg5EtUX4oZBdUFDw== dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/popper" "8.13.15" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/popper" "8.16.0" "@dhis2/multi-calendar-dates" "1.0.2" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/card@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.13.15.tgz#87e67ebc2c92512fb729016571d0be40cbf079ca" - integrity sha512-70VZHAuHGBqw4AKBJd1HgcsMyTfQ++yzip5c8ykLU7AZQi7WS8W/fMDvV9DGFE5Lc3JyIZdr15Uh31d/v+EBUA== +"@dhis2-ui/card@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.16.0.tgz#86dbd4d1e219de1d08a15d132fb7b402609006ad" + integrity sha512-7Y2xmyUL6omqwhsj3j9OzMfw7c/jWOXb2mWO0YYHroxreViHDadi6jbROp2iJbS38FfA6Svn5R+rWaVs6IJ9xQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/center@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.13.15.tgz#fd434cd37e6d5eb4a01b4830c2c316fbb814c188" - integrity sha512-+YQFxzNrwYQWsZZYEHM4ywzaGbrjfQWcK4WIPAHifVYau2efPDXAMGQ8cpDrRUivpxCYi3Rpvpp965Dp5+KOYQ== +"@dhis2-ui/center@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.16.0.tgz#eff8d9a5e663d1a541a23d6d0b715351738f116b" + integrity sha512-ELfUaNaayaX6CFFijGJV3phNIj6pNFv32yS14Pmu7K9SbpnhIFqIB/Zepg6KkCxClqKXX1ALqwBXhaEWROVAXQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/checkbox@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.13.15.tgz#ed8beaf55fe32c222f35e2ee2497191dee2ddefe" - integrity sha512-fhi50vBK8v5fXzkNOcZlZR8pxO72GwwVKuTmDkrDeAIKIiNQuNZoxkAkU3vwEGv/rdO3TREbAfzTbtjRui3XHQ== +"@dhis2-ui/checkbox@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.16.0.tgz#55c7d95bfab6d70c3dd30f85e9b60debce00edad" + integrity sha512-yAP//QBULxaq7c2KjwY6YwIEkqP77AoMh6sSmh1yfQaYtiGO79c+T4Na8Acqt847ERhylKWtkoFyOu6S4ol6QA== dependencies: - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/required" "8.13.15" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/required" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/chip@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.13.15.tgz#efd576e7556b241c852b7176762e70e22f84b2e0" - integrity sha512-MJSKIX/KIZBKjQPhIUTwMasmvY4M2ftlYQ61d9Px1YAuivuE+VTvGCsFF0q5EAKMx5ETd6SD1X3PrwzdtHru4Q== +"@dhis2-ui/chip@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.16.0.tgz#976c1c4b0ab067ce24df37b1293126b12753a455" + integrity sha512-AglEijghZT6LTAIMy0aID1vp22hjxBN5GYF1chLFEujBm1Pt10ld35URU6CpHlEgreWUCjKMllNa4IpCJO1IUw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/cover@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.13.15.tgz#28ac0f54a39f217518a0df501665829188d5945d" - integrity sha512-3e4XwsnhaVNSNTF2wNk6V+3CzsKCZuLsqMq049ScdaCCrv83qro1cRfRTNqNUJiXnmTubrgU8yxV0kXrFIKZJg== +"@dhis2-ui/cover@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.16.0.tgz#88b63ffb99c209b3327a3e7d50d519074ce06bab" + integrity sha512-4xKMzt4cOb3MFQMoK42gmhJXJKW5BiRloToC7PnLCZnnXNzuLIXrQ5rxz0C8vJ/+rh7g8XLjOhLCXCEJjMAp4w== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/css@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.13.15.tgz#8e8073a0c69070f598c27abdef52c36981d77421" - integrity sha512-9aAWUpE36SVS17AQXz3x9KkoRpIkvruat+tk2eabw0vfTB6xVRPzC1oO28mltYhpWNOLLS+k1USwfhDSiiqASw== +"@dhis2-ui/css@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.16.0.tgz#fee49707a209c62da05e9cb221372874f12401e9" + integrity sha512-O5YVBv8EFnw30xMgPopcAmkpcsVc99XuARv+3rxpMxfOuVtH0Y6BjWh/RJhvZLYc4OrfsrQDRoIlhvZUKGRv/A== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/divider@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.13.15.tgz#c4ef063b31aa80735c2288dd9f5cbaa2c79b123e" - integrity sha512-bIQKnaCddH2Pr9e3j3CFFWMvGR51gvw71G4NTHsNGZTWNbVL54tZo4ifhkmkfNvf3cLuF/V6IlpQzrf/X8Iu9g== +"@dhis2-ui/divider@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.16.0.tgz#afc0d8104e433372bbdee63ff508ffef88d12800" + integrity sha512-Zomxz5Z87G4UP1VmTlLrpc19gQmlCtABDxVyirIMv7ZnUXUozj0KFzhO6VJAF7qPo5Q4cKV/6ZkprPwYAN4I9A== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/field@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.13.15.tgz#f91ca25936ea926e82ac17c62b28faa2eae2898b" - integrity sha512-2aBumqc77kBC0gl0A+zGOv+en/pu2YUNYwEEpvq5TE2NOvSktWgUOR6Pk/5NDGtB8ugkxgdjAbgcOk/SRuxQJA== +"@dhis2-ui/field@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.16.0.tgz#d985198ada6f857f88a9b7023b095dfcc1f7c649" + integrity sha512-aaEwfxenl1MU7Kv2r5r7nwjVtIUH4zSZFSSBXBYQQlirsTTjsJWlbo4urnY5y649OpqJnSoiaZTndhKMGk/MHg== dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/help" "8.13.15" - "@dhis2-ui/label" "8.13.15" + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/help" "8.16.0" + "@dhis2-ui/label" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/file-input@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.13.15.tgz#df974db2ea5cf072b63b4336c84eaa5f989dbcaa" - integrity sha512-il5j+6s+874XX/uS4teXQCrFjnmJgVg5RTViZ5toDUZRUpjx86zLKUcTDANfrxG3eUR+F4dkdsvccXFTkA1dTg== +"@dhis2-ui/file-input@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.16.0.tgz#2bae2a4312aa8848c91413d21bb081058705898c" + integrity sha512-C6DnqUidG8+GIan0+b7dvQQnJilBvd98DlKC2FrrnSq0gtkf5TI0nY7U8GMjaupRVy3kJ0M4dIYIGvWatJgXAg== dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/label" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/status-icon" "8.13.15" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/label" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/status-icon" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/header-bar@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.13.15.tgz#40d5c5fb0ba3ff5dce2870125ededa83cd3f1cc6" - integrity sha512-OjGKPU0ia+q53NM0hZMfnNkb8Sh/Ty4q/WcDw9qr0Yzow29G30Z4TH+B8le9SSvUBXBiZ8Q/Rv170JMON0Zygg== - dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/center" "8.13.15" - "@dhis2-ui/divider" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/logo" "8.13.15" - "@dhis2-ui/menu" "8.13.15" - "@dhis2-ui/modal" "8.13.15" - "@dhis2-ui/user-avatar" "8.13.15" +"@dhis2-ui/header-bar@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.16.0.tgz#43b94c1e3ce337d2e3d39026ba43fc2e637d9408" + integrity sha512-UwyhAU3MUYfmfKVp7IE0A0CSwxwGQveuxNFRpZh+LpWO2pC7/gkb7Tv2ISfrIdf8R+a/FU6SUkmKp7iWFyz3Eg== + dependencies: + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/center" "8.16.0" + "@dhis2-ui/divider" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/logo" "8.16.0" + "@dhis2-ui/menu" "8.16.0" + "@dhis2-ui/modal" "8.16.0" + "@dhis2-ui/user-avatar" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" moment "^2.29.1" prop-types "^15.7.2" -"@dhis2-ui/help@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.13.15.tgz#a3c1adcc655afcc9f24cf13aa9f0597b24593810" - integrity sha512-7obQDeD0dZOyf+Sm808EZeTeCLIFndd0fdPD1vTmTOnevv+W2grT7dCwsFwZ2AsX+GLbzzd+10ikXE8da6OPPQ== +"@dhis2-ui/help@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.16.0.tgz#d1d3abc06aace2f753d0e89300bbd15ca03be343" + integrity sha512-5Ag6d92iFpB2gJfIXx0bodHnuv0J9FWMnMkVscfOS2LiIFHzJNrR/iEnXmbFSzLBaPvE4gFjmAZ0WskDXdPt+g== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/input@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.13.15.tgz#cdeb7bf5b63814b4a571b843e580527868f57f32" - integrity sha512-8K4yqeZmYQpvNA+TRWtFwWWC4HbzgotxJ6FoXdUJ34LVHQZJNCaRC0L0B1lHLCnP41WHnY0uYcFovY0kl0G/vA== +"@dhis2-ui/input@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.16.0.tgz#ac14629d11a492f658b992937f8ee3edc4f14857" + integrity sha512-Zn+Jo+NkVJSHdKwWz9WMPYmnKRDM/metSjnDdAZ2guIS820dNCPgsbC1+DOgMKVxtl+DSb0e+05niIVwsAIELA== dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/status-icon" "8.13.15" + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/status-icon" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/intersection-detector@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.13.15.tgz#460389648c7cd95a45b881db7a4f997ca7fce045" - integrity sha512-M7gaWb50eu3LPoU6vd5CAz9uLDsyFmacr7RCUQO5FlBQ/cGU6Xvfd8+oaH5R7PqP/YSyNsPi4yP9cpXSlzU1Gw== +"@dhis2-ui/intersection-detector@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.16.0.tgz#c525b9a7bc2268e0cc063e4a1f30c37c79be6262" + integrity sha512-z8b9RjRBG5PgRgB85ltUC+toN2IgXCHmMXpxyAfEL3tE4asej4y75cWLafY1sO8QkwwHJBAlEq0IrPUS8ggKzw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/label@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.13.15.tgz#6a5a42fce24f2d11507f58c3a4782d50ac2fe764" - integrity sha512-+lC8gJTxB81n0/83Nfs1KrgkR7SitdHb40nZh3/VgfRzWJzxESL/VMpA/dz1Y+7eZ8To/exRYvrfoHGI6qpvog== +"@dhis2-ui/label@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.16.0.tgz#c6558ed1076c6d0955898135917cc3bf64d3a5e8" + integrity sha512-OrtE4ZfDH3lBApL1mR/eZ1Ndr14V/FwgUoER9Xw9Zmt8vNGhtYHkWzLzwnzsSiV0gkJ0rHF/SU7nctVOWdQQjQ== dependencies: - "@dhis2-ui/required" "8.13.15" + "@dhis2-ui/required" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/layer@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.13.15.tgz#ab0f15ea5dea3666718faf08f0e812830ec536c4" - integrity sha512-OWlwvW1a4/SKdYCy+Dc7OkGT2Cc+6GHIHRDTQwNQdBGUAtosx/AmsmBv+sCPKl2CMaZQTwL7dRbN/80YOWdklA== +"@dhis2-ui/layer@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.16.0.tgz#f2b9b1de1770c8584e5b3cdc217b1ba11039a8b1" + integrity sha512-GHIud7bFoXPSBGkkiJXCQqnYuEh0eXllF62eJTnFu3iMzoroepylxiDLDXzQMhxc1bCmkQBEgX5aNzT3riHH5A== dependencies: - "@dhis2-ui/portal" "8.13.15" + "@dhis2-ui/portal" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/legend@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.13.15.tgz#0ba933eac4839d31b37083b4291e637c99a9188e" - integrity sha512-KE5+YBs+YUHmUB1EKfWa/yWc5WcICP3+RH1g9zqK+L6FmO+iH+pFHzF+grtaeOM7ZbrqvXGSamK+UbUYlcn5TA== +"@dhis2-ui/legend@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.16.0.tgz#0c89f557b1feb3b229d9f63772f1d3c54af559a9" + integrity sha512-0RNCMh6KAo/wIsbvi0cAvTNCbDd517iF/IJ7pugSCHflACrN0i+p/ZqL/bXcXlI7pM6dssn1tjto4qvcyncuUQ== dependencies: - "@dhis2-ui/required" "8.13.15" + "@dhis2-ui/required" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/loader@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.13.15.tgz#726a3f7c43ec268d1ba4fa115e2ff45f4d983017" - integrity sha512-P/uMn84ME4NVlVNnHcCjbf6Gi042tuRHxAWoYf/R35rYoKnVCJTul4dKf1JCBNRJUpQtEuaT/EGk0G11iZIBog== +"@dhis2-ui/loader@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.16.0.tgz#cd3a7736e65c7096175ccfca68ede041ce441129" + integrity sha512-AyHID3Wftk6j4n6hoHpjx4OZF3ENtDBcOIrSVCbLpv+y14m06RZk0T6wekSnplW/1zCFruS5vLZNR7aYJEKIyA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/logo@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.13.15.tgz#c1c9fe8a6e0ed3055027202790d19e6234b01eee" - integrity sha512-dRW5doMz57kjn+CeHtRXy5eVjkHj2xFzU0CA4A+pfTb6mXlwDrC8C7ixpbwIcYky51AS02zKaygoGmODRZt9Ow== +"@dhis2-ui/logo@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.16.0.tgz#b600ad9db431a7e478cc53b9b0ba09a0cc9a51af" + integrity sha512-5NXPKRKEZN99DXP2TOHTximelZZh43qYUWgcVmB7RkiM7EBKaNQkz1LtP6cV5yv2Jr4RQtW3Myg690Wtgg+VNg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/menu@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.13.15.tgz#9193a0fc5cc2610ad5b9a68b97acd0f1f218be70" - integrity sha512-dzkRRRk2eogzHlJuR6JONd7NeVU1Ct1zmhlsHDqTHc8p1vO3/FYIF6SWBJErFTXmWSs9kYA4WnZHk/xiyKWFQA== +"@dhis2-ui/menu@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.16.0.tgz#31fa42d534cf34cfa07c1ecfe16877226e3f7d5e" + integrity sha512-oT7UVlMAM3xl5WDpdVjAgcHG5d9ACza+bUsMAXNURT0ceW1kD6OKLfmNNJOixpudwmZ45G6b1gBUqVQ3REXNTg== dependencies: - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/divider" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/popper" "8.13.15" - "@dhis2-ui/portal" "8.13.15" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/divider" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/popper" "8.16.0" + "@dhis2-ui/portal" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/modal@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.13.15.tgz#d0865e7b60bc4baf2865133007d730f959592713" - integrity sha512-ptCxzIXnHv9AOcwW33XgmMqb072Z8ZishfjLzlZVhNdiFbwBmCvr+yu5zpTj0I0fISotz7fpAF38tWIsp9CPOA== +"@dhis2-ui/modal@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.16.0.tgz#7c5b193533e00070fbb9e0699180853463dbc6fd" + integrity sha512-RJb6UTMoU1juuc4V5hIJj59YokZ4WoqbQoyjGfWMSf5zFfXAWT36HlOTnew322dekZA5CGt0hcxlcuqpbRaJjQ== dependencies: - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/center" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/portal" "8.13.15" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/center" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/portal" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/node@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.13.15.tgz#c0221389511bf571fc08f9b3c55963b37d65aac3" - integrity sha512-yG39zK1UEBnABqfrVL9dnoZWaqUY4WTnkfHOwxBI8k7DhTDmoFA/Otqlfu1ILgdnz/W1SLpxGhqRqa1pg4m4Gg== +"@dhis2-ui/node@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.16.0.tgz#9dd9e8c99d036297eb6f2da38c07e50739ce6585" + integrity sha512-QpwwKuIK8Z+DlYB9LhXe8NWQNJdZBotjl0qU8faltVIsRGC76YzT1jbcIMvxKcVRaQOdNQtMt1uOYd4KCnA04Q== dependencies: - "@dhis2-ui/loader" "8.13.15" + "@dhis2-ui/loader" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/notice-box@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.13.15.tgz#e53a8f4db842bae0966b8a562bafc685cf17af83" - integrity sha512-vY7vAwlRQMYZvNvByVRQqGTjTnMHbKPWWcNlAx23otZDIPJG4z+hxBV0dX+e6hKpZFjtW+5zAOMe4JgS8McrmA== +"@dhis2-ui/notice-box@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.16.0.tgz#a1878418e0591cfa0382b6f947559a25d5ca351c" + integrity sha512-TulrAmzU3MXs1l1xqwikOtSRivkQKC2RLBta+ZRAXGEqH0VFUoDkk9OtTZ0QsNJRAXs/NHQZ2REhZfRCaiWI7w== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/organisation-unit-tree@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.13.15.tgz#b9750f10d945baca95b8cfb43684d3e1858f7b8a" - integrity sha512-jGPiSBqo9vtvIzKpRVMUeDpmqxmjz6vwEcMqLwyWTh8YxC5nGw20wwj33z6SW/5BoSIgbgQZxxH3B6NBUbO8fA== +"@dhis2-ui/organisation-unit-tree@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.16.0.tgz#b491f6f7f76f5d68b0be597e241553d1f150c4ed" + integrity sha512-VkqwNz2bqiOuP3bsnKeuReraQzhKe+R4dtPIjPUZpe+vA78uQfcsOB1OUK3JqI/9qL8eL0RYepoACHQwb+1MNw== dependencies: - "@dhis2-ui/checkbox" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/node" "8.13.15" + "@dhis2-ui/checkbox" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/node" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/pagination@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.13.15.tgz#ec73473380339ab646db0a5e336e5571e024f9ff" - integrity sha512-Kbixe3HFW168EiLkPu8hNe2CqnI+B6n0maVOeZJv90l0bW5FSXLHs669Fr6y2sTl0YVgwK94IoLOCJSWFldvIA== +"@dhis2-ui/pagination@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.16.0.tgz#f50b7408f48e77134c9c1457a77fde07cb166aa8" + integrity sha512-oytevq4Bb0fGXeL3hVBz7P5dGBxSpenV0AOhNA3W7m7/UNSmFJXJjWRB+nvHS6jcq0/gxNJvEZctGF/zlViyVQ== dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/select" "8.13.15" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/select" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popover@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.13.15.tgz#41bb965b8fddd8b88349c9174ff7c63a392fab25" - integrity sha512-i32u23IAKkCi26Adcom8P8kMEP+EIw/rBcTYNHmPc1wrfVPnMfkVf+fFsVcoY7t1gcNFO88SiyJNffso7S1BPg== +"@dhis2-ui/popover@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.16.0.tgz#e01dfa4d9ceb50b94d4a28f824427d1fe14cd892" + integrity sha512-UPZ+9JTD4j4kVUge97zzXVknnlWIabO3YZFL/2O2tjHo23OUR4bl3AnUYiWYXVVIB7B28cadKHBa8ybnNn+gSA== dependencies: - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/popper" "8.13.15" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/popper" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popper@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.13.15.tgz#c4c29c16c92221716a8806791bc383b6209acee6" - integrity sha512-gOIDZzvfH8oA0Hf7V0HEi3Y99KRcDdmog/BqnsiqEV/EAV/VRHq5qk239bIqKATM1Ei7Xv7G0lEBXJIZqOeNVA== +"@dhis2-ui/popper@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.16.0.tgz#0f574233b55d259c416c7841a4bcbd618a06f06f" + integrity sha512-O0zztHX63rHYVV2YoexQjmzKwSjAJxZBFqN6f5glaZHstfgFr43/XDTJo91JT5yZKX5gkhFRC7TlhzC5UUzpQw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" "@popperjs/core" "^2.10.1" classnames "^2.3.1" prop-types "^15.7.2" react-popper "^2.2.5" resize-observer-polyfill "^1.5.1" -"@dhis2-ui/portal@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.13.15.tgz#701b0294d069239c7afefd1e1e211b9b80f72dc1" - integrity sha512-oqSbsOyznJwpdpAUiur5v24SOlThcWEbhnvniXSZzZy4thSJpcdF6OLMhgvVcjfO8kyAGgMbQjEx+hZ6cVpCFQ== +"@dhis2-ui/portal@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.16.0.tgz#57fb8f3bd91e5ec3e9116fd9208f3aa3034c4dfc" + integrity sha512-I5+lc2QLEu7foKOJJnv4I4XcKlgwGzvmFF0AhJsyY5rmsFpZ+xZRSReOpdZdCWeL8tHboVddRJ9laLHfHx5BkQ== dependencies: classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/radio@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.13.15.tgz#4475abe33148bef6cd532888ee6077864674ebeb" - integrity sha512-k+ahM17CLIwquuN6XD9LCzkjPR+Zkvpcl8Cb8GzJNpovkhqdDJMvFezmBu7oxyABzVzNYILnuouqGsQwF6G4UQ== +"@dhis2-ui/radio@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.16.0.tgz#35c87c4a047509b455f0deef72f13d1525f6ae90" + integrity sha512-dNPIJa2PdZR9pHLbLPxcT7ppaV3GQPUjwXPYB2QA2KLilNmb2aQWFKKnuNaOZTA4qwS/H5SGHuM0k3NvY4tRtA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/required@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.13.15.tgz#bba0fda4f693ab9d53f0822b3ad0375ee6c217e7" - integrity sha512-Qlt84rdcsP4i0faaOvOcedP2dFbZp08ASh3ylNwSbLcP2R+aNv9mXQCR6U2mW2WjCMsgAfGzApdMFgYZJfI9QQ== +"@dhis2-ui/required@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.16.0.tgz#3c7c65d1f462910620056b64873ccfd491752a2c" + integrity sha512-LjyvfCQZ+muxl1L1HW3KvhN1xfvpBisHcP0lA4MpEDC2ca/wnGqILxnPWC6RzMnnXA7OovMnmm+a80V/JCuEmw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/segmented-control@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.13.15.tgz#2ecbd81075ea81b974912bab05d9d23f15c12382" - integrity sha512-+oulCoUVDHkxV5WPjGwzpgN9qmIwVW1/9TbW6JvC87gbiywAWaN59dhIIRoBRqeBOy0Ll9DW2L3siBYfMY43vg== +"@dhis2-ui/segmented-control@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.16.0.tgz#7120f68be62f6718ea9ca9cc1527dc856c4f8be3" + integrity sha512-JAmHEkiXF/qBVTOykjkE8s36E4ZTq48NJE9ON4Z2Umrh9EHqm8vZEbBZ9EJaSIzT7NROIDG6mbgb9ZWNQHevfA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/select@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.13.15.tgz#3125ddb871da60bb1cbdf663ec4109c579fba0fb" - integrity sha512-yVNCws1GUmbXCOBKx2ZdwC5OEVt3wLPOSUOswVrJA3/ZjE0/ji5Or193/u9dhvLgDBzTt/ZIhKVksa4sT/pGCg== - dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/checkbox" "8.13.15" - "@dhis2-ui/chip" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/popper" "8.13.15" - "@dhis2-ui/status-icon" "8.13.15" +"@dhis2-ui/select@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.16.0.tgz#6446be9c0fe853e7071dabb2d0b48905cfc2ee1e" + integrity sha512-J0AQA3Sgu4T0/0rbiC0gkcD+HA2C7PmOyW4PTvDk7PWLLROh40leWqfLVAJT1JmTic0sBE6pMDk/B8ilODlfhw== + dependencies: + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/checkbox" "8.16.0" + "@dhis2-ui/chip" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/popper" "8.16.0" + "@dhis2-ui/status-icon" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/selector-bar@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.13.15.tgz#96239ca8025b55999c6823c1a16ccfd95913ca46" - integrity sha512-QSNuy3nx3bh8LRvLnx+1ygovyB9kEcS965Gdfm4l3no2wVcD2GMBsQlhKGtoIgxEWSJKKQ15oGrybEsWWuMAAw== - dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/popper" "8.13.15" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" +"@dhis2-ui/selector-bar@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.16.0.tgz#2622d4fa3a2e08d29f09fbc508862636a3a3060b" + integrity sha512-f6iEHXIglHZTmc1ljmosrUSZjbBcdY7pWZYDQp/ybpuVyi5T4rV1/bPliZXZRydnp0WkBM+nDuKD/tJRtUAKlg== + dependencies: + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/popper" "8.16.0" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" "@testing-library/react" "^12.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/sharing-dialog@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.13.15.tgz#0dd96295d200e22f937e9bfab21b444a7680f3bd" - integrity sha512-IRA5xD3vNwASnEoNV10+j/YXy5s9LqxolDWI/GlCHPGnuYxdlCb4NdbwWSFdyuzBtB3XrrGN4/h3BVMRtCKXBA== - dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/divider" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/menu" "8.13.15" - "@dhis2-ui/modal" "8.13.15" - "@dhis2-ui/notice-box" "8.13.15" - "@dhis2-ui/popper" "8.13.15" - "@dhis2-ui/select" "8.13.15" - "@dhis2-ui/tab" "8.13.15" - "@dhis2-ui/tooltip" "8.13.15" - "@dhis2-ui/user-avatar" "8.13.15" +"@dhis2-ui/sharing-dialog@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.16.0.tgz#49f45b9b0d488c4bc4e51c46f6bd0cce7ee39204" + integrity sha512-1YuiKlghl7PbZxK7vbLFgknrMoX7ld2AnYMWwiJmJPPwAvyHjq+MeWTYCaNjZJV2bBslO41CONyhN8eE/4cF2w== + dependencies: + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/divider" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/menu" "8.16.0" + "@dhis2-ui/modal" "8.16.0" + "@dhis2-ui/notice-box" "8.16.0" + "@dhis2-ui/popper" "8.16.0" + "@dhis2-ui/select" "8.16.0" + "@dhis2-ui/tab" "8.16.0" + "@dhis2-ui/tooltip" "8.16.0" + "@dhis2-ui/user-avatar" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" "@react-hook/size" "^2.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/status-icon@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.13.15.tgz#b97326cb30fab4f6c8913eabc06b9a1f19c7e670" - integrity sha512-+MBRhmaLA9b0bkXEr5eCwN8FFdGq5u3RWXanvAGXlZ0WT7xYUfnqFellJ7qkM/tQQEoBzwuK1nrMLt4YWCrEuw== +"@dhis2-ui/status-icon@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.16.0.tgz#0f2e041d1e971768c7be99a663ad571f165c307a" + integrity sha512-SsCUdi1U0a7dm3ZCxVpjGi6zyK0+lh/wSDLn+tlzdIlDYTlyjgBdUiqJiBoqv53Ob9PSyyCcxxEqt0nQlMQLbQ== dependencies: - "@dhis2-ui/loader" "8.13.15" + "@dhis2-ui/loader" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/switch@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.13.15.tgz#b064e8b1af0666756282da7ae59b40218e454ffb" - integrity sha512-E7o3SsNAN6OAt6zmizIfq1Uh4o0GPnwkK4l65JR32/4aMu6oC8omZFBtigmx26bo2P3AS0iIzar0gXwz4LIdyA== +"@dhis2-ui/switch@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.16.0.tgz#37dffc57dd76899014e43167d0076e8017253d2a" + integrity sha512-Gi3UcoIkarTEZW54c5LY2+JSQ2413HytTzc5iA5eeNKwX1Y7PV7xrbeIsC0hLOgK9pZaVe4pHJlpKpO26v/2vg== dependencies: - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/required" "8.13.15" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/required" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tab@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.13.15.tgz#a076b19761d327d481a25fc33d13be8996889b93" - integrity sha512-ak/OVhhHjnBAGPNuEl8Bekh/i7zroeP6BvkHMljpdDpbUN5Ex6+bgnwMpCEZ4qtwwTlZykbIsYelXDlRIGn7rQ== +"@dhis2-ui/tab@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.16.0.tgz#218864494102c52f44df221c231f9f1b9e052082" + integrity sha512-03B6o7gFmc9LK25/npLmZ8pT5+ax+ELLd3c0wYwdNYLYRk0c0MQEag7LChCRfz8M8P0LCd4kPceVFeTXOUZc6g== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/table@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.13.15.tgz#b71680bef5209a4d30c47edb07edcb4a1e9def15" - integrity sha512-tJVQAA1pwji9AjyFr6oKWRzU01Vp/Lbk/5CQnrCqU9kh+uLIoyAfeyjF0kWGCB2uE37WrR5gC6/zOlSow3QqXw== +"@dhis2-ui/table@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.16.0.tgz#869c04df7fd72e3ae590d252f7417d2a809cd1f9" + integrity sha512-a7r8WfAP2MmrtvaqhmozTiOXu14wIUhu9zQkNIKlepQEQafTfDRqM5+oaapAfAOWvR5tlxlaZaF/IdOmS4vZew== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tag@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.13.15.tgz#cd6ccdb55bfba2ff102ae0cca0ae4fb1a9aea0b9" - integrity sha512-KzQYvRWEwOt2jkiv98tdyIH4Ibv2iUtoGo2Dik9Y0LAWRrPW5N8+x+/7Lr6G0ggBL10AhVrKOqA0PVxLYbFjMw== +"@dhis2-ui/tag@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.16.0.tgz#1cf5d89303c5d8342bfa1987cd9801980c7e1283" + integrity sha512-k9y6ZAbV5uh7swHB/s4lLbMkbQ26SxJBCFTQ64YbqYmuUGi7GTZM6gGLJznQND/xNJvydkVX51yI44/GPx9vBg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/text-area@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.13.15.tgz#48d21eb7093fae2a2a6667f28c996ddd83251d54" - integrity sha512-djZt2OQH1CBaTPOg4iAgllNLYfbcvMuSQ9AR/hr1mf3/85e9ZLc12enXN0AaVkSQopemHvH/KcgNhA8ogEGWhQ== +"@dhis2-ui/text-area@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.16.0.tgz#13e7e351b982d21a693db2e405aa9671e493c187" + integrity sha512-UMhOaNigxYp4K8VQtlaSdFuC6FErSbB7RCN22ii7Ic12XBsVoWKjGCkhdol3w7+rHefPbp+9SmJExyj+9E2y5g== dependencies: - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/status-icon" "8.13.15" + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/status-icon" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-icons" "8.13.15" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-icons" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tooltip@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.13.15.tgz#22acbbf785c51fd9a924621ae9c50f7a58fa88a5" - integrity sha512-6igahGDmonAJJIqmQsm93UCb/mn2Qvivk8NWk6SFDTRVFj6g2I/5ugK5oEn0BQcbIC98bddIj+rBKO2Gzj7oPA== +"@dhis2-ui/tooltip@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.16.0.tgz#6b52906b45ce9d048a1c39f960750c1aa906c527" + integrity sha512-h4BveS+DKwq8Tb9ThqvGynhPwRe0eerU73jdii3orh9tnf/skNYYQrc388t1t1Ti7PHw40eWVOWXs1xfBLtLoA== dependencies: - "@dhis2-ui/popper" "8.13.15" - "@dhis2-ui/portal" "8.13.15" + "@dhis2-ui/popper" "8.16.0" + "@dhis2-ui/portal" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/transfer@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.13.15.tgz#de7199c68664821c3653a0e123e9bc9cd22ec745" - integrity sha512-blcrk8S3YXwVwlPS7UUkdVq6eg48j4Uqi/nir3t2HbfcnJDl3EjQW22xv/nSHcvDi5rzZ6cflVHWLzp4lJdObg== +"@dhis2-ui/transfer@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.16.0.tgz#4de6686b83dcc8cb41e186a04b7ec22cc1f2b15e" + integrity sha512-uds51dhlqRFsnaNL1cKedWy9/R4abmx5H/BAWzvNRhnTJaY33KplXlxcfTta/9TaN530uZt1fCE5NwC+dPBZqQ== dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/intersection-detector" "8.13.15" - "@dhis2-ui/loader" "8.13.15" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/intersection-detector" "8.16.0" + "@dhis2-ui/loader" "8.16.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/user-avatar@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.13.15.tgz#619150face6561ecd679385a9fdd099d53a6b86e" - integrity sha512-wo6hYzTYY3rTtwiR1iSGunk02h5rvMfWok5HfCrvV4Dy+aSiegygS1ZQ806Dttmq4s03sVvMuZUX15v7GIfE4w== +"@dhis2-ui/user-avatar@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.16.0.tgz#c5b8ebbf5c486c8bb79b2ce20360d8f07eb2d3d2" + integrity sha512-4dhKcVoQ07UBGIjWmyk6UbzLhXnmpmSg0zbkorvwdYi34NrhQeskRrGbJCEr/SWUbhxeA085LajmJL/2YH8GVg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.15" + "@dhis2/ui-constants" "8.16.0" classnames "^2.3.1" prop-types "^15.7.2" @@ -2293,91 +2293,91 @@ workbox-routing "^6.1.5" workbox-strategies "^6.1.5" -"@dhis2/ui-constants@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.13.15.tgz#e1124e79f077aed6b3a9703b8a257701ec68717b" - integrity sha512-XrwKXNM0Xiv7O3E9vAukOJv8sD1QD9ruLOUS66+fs4pBLd0L+W6Gjr7LYG1B19rANXAShmfR+dqgD/pLVLAqsw== +"@dhis2/ui-constants@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.16.0.tgz#ab37fbe34ba074fd303ea405b13ea8ba93bfcafe" + integrity sha512-IXYyLmVRCfY7JBZUrRdOCqhYP5B5uvH/6SZL54apHgnl5JpblTdK9YxSYjr38m0MgiRmL07NLjK0nW7xVTzV0g== dependencies: prop-types "^15.7.2" -"@dhis2/ui-forms@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.13.15.tgz#5098893acada5fb06d263ce271f556fc1bae1acf" - integrity sha512-+skh3quuARmzVlVJUYnN8EM5Dz9OLOsnh/GpCMXyiO4yjhajpbQ0QtMh/dFyQhCB3LzywDVaoge+kwJyrIS82Q== - dependencies: - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/checkbox" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/file-input" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/radio" "8.13.15" - "@dhis2-ui/select" "8.13.15" - "@dhis2-ui/switch" "8.13.15" - "@dhis2-ui/text-area" "8.13.15" +"@dhis2/ui-forms@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.16.0.tgz#6d896ebd6a0de89c4e9fd63f919c084464db3036" + integrity sha512-tOS+0sQxh36H4IeoAnlXr0C1nKx+Ckq/9W9r3I0+8OidMzlZD7u+43IcpWI02r9AEZC6LlNRwdM2wOjXnJXN9w== + dependencies: + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/checkbox" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/file-input" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/radio" "8.16.0" + "@dhis2-ui/select" "8.16.0" + "@dhis2-ui/switch" "8.16.0" + "@dhis2-ui/text-area" "8.16.0" "@dhis2/prop-types" "^3.1.2" classnames "^2.3.1" final-form "^4.20.2" prop-types "^15.7.2" react-final-form "^6.5.3" -"@dhis2/ui-icons@8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.13.15.tgz#eb83784975d9686058ce71377928a0d4f726b517" - integrity sha512-d4A7oPgT6HKZgQDGaY8mX04EvQrnDmOv/L9n52JtnmEcPrPTqqhmCqdr/CQ8B/NP91nhFACDFBQ4ez4/YJVYKw== - -"@dhis2/ui@^8.12.3", "@dhis2/ui@^8.13.15": - version "8.13.15" - resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.13.15.tgz#d270dd9d1fcbc76f015adea97b033d4ca0fe95f4" - integrity sha512-bHg2CtXq8IRE86sDwlty3I5v8SrYmi2z469ugbEgrvNoVfgXxKeQZXzLMKxednt/sGDnSbveAduiq/QUMuKyQA== - dependencies: - "@dhis2-ui/alert" "8.13.15" - "@dhis2-ui/box" "8.13.15" - "@dhis2-ui/button" "8.13.15" - "@dhis2-ui/calendar" "8.13.15" - "@dhis2-ui/card" "8.13.15" - "@dhis2-ui/center" "8.13.15" - "@dhis2-ui/checkbox" "8.13.15" - "@dhis2-ui/chip" "8.13.15" - "@dhis2-ui/cover" "8.13.15" - "@dhis2-ui/css" "8.13.15" - "@dhis2-ui/divider" "8.13.15" - "@dhis2-ui/field" "8.13.15" - "@dhis2-ui/file-input" "8.13.15" - "@dhis2-ui/header-bar" "8.13.15" - "@dhis2-ui/help" "8.13.15" - "@dhis2-ui/input" "8.13.15" - "@dhis2-ui/intersection-detector" "8.13.15" - "@dhis2-ui/label" "8.13.15" - "@dhis2-ui/layer" "8.13.15" - "@dhis2-ui/legend" "8.13.15" - "@dhis2-ui/loader" "8.13.15" - "@dhis2-ui/logo" "8.13.15" - "@dhis2-ui/menu" "8.13.15" - "@dhis2-ui/modal" "8.13.15" - "@dhis2-ui/node" "8.13.15" - "@dhis2-ui/notice-box" "8.13.15" - "@dhis2-ui/organisation-unit-tree" "8.13.15" - "@dhis2-ui/pagination" "8.13.15" - "@dhis2-ui/popover" "8.13.15" - "@dhis2-ui/popper" "8.13.15" - "@dhis2-ui/portal" "8.13.15" - "@dhis2-ui/radio" "8.13.15" - "@dhis2-ui/required" "8.13.15" - "@dhis2-ui/segmented-control" "8.13.15" - "@dhis2-ui/select" "8.13.15" - "@dhis2-ui/selector-bar" "8.13.15" - "@dhis2-ui/sharing-dialog" "8.13.15" - "@dhis2-ui/switch" "8.13.15" - "@dhis2-ui/tab" "8.13.15" - "@dhis2-ui/table" "8.13.15" - "@dhis2-ui/tag" "8.13.15" - "@dhis2-ui/text-area" "8.13.15" - "@dhis2-ui/tooltip" "8.13.15" - "@dhis2-ui/transfer" "8.13.15" - "@dhis2-ui/user-avatar" "8.13.15" - "@dhis2/ui-constants" "8.13.15" - "@dhis2/ui-forms" "8.13.15" - "@dhis2/ui-icons" "8.13.15" +"@dhis2/ui-icons@8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.16.0.tgz#eda8efc060740b17c1821c89a14435b938ef8c27" + integrity sha512-RaYCrFuqN6/l0mF+71CyxvRKwXCfaUfMQudTgdCpZw0OwwoRmfg4wJdB75u+jl4RUj/E447zl439YGyHEbStHw== + +"@dhis2/ui@^8.12.3", "@dhis2/ui@^8.16.0": + version "8.16.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.16.0.tgz#b427cb3d35b0e8c8d2e8c3abfeec333dd54ef7b2" + integrity sha512-qWUd0dBRXT+dkuCbs7XlPl3YpXRJuouTM2Uf5Wa7z5VHsFVPBrHRBGmgYqmJpTrrQBFTnRmrKHVjSqfnm14D5g== + dependencies: + "@dhis2-ui/alert" "8.16.0" + "@dhis2-ui/box" "8.16.0" + "@dhis2-ui/button" "8.16.0" + "@dhis2-ui/calendar" "8.16.0" + "@dhis2-ui/card" "8.16.0" + "@dhis2-ui/center" "8.16.0" + "@dhis2-ui/checkbox" "8.16.0" + "@dhis2-ui/chip" "8.16.0" + "@dhis2-ui/cover" "8.16.0" + "@dhis2-ui/css" "8.16.0" + "@dhis2-ui/divider" "8.16.0" + "@dhis2-ui/field" "8.16.0" + "@dhis2-ui/file-input" "8.16.0" + "@dhis2-ui/header-bar" "8.16.0" + "@dhis2-ui/help" "8.16.0" + "@dhis2-ui/input" "8.16.0" + "@dhis2-ui/intersection-detector" "8.16.0" + "@dhis2-ui/label" "8.16.0" + "@dhis2-ui/layer" "8.16.0" + "@dhis2-ui/legend" "8.16.0" + "@dhis2-ui/loader" "8.16.0" + "@dhis2-ui/logo" "8.16.0" + "@dhis2-ui/menu" "8.16.0" + "@dhis2-ui/modal" "8.16.0" + "@dhis2-ui/node" "8.16.0" + "@dhis2-ui/notice-box" "8.16.0" + "@dhis2-ui/organisation-unit-tree" "8.16.0" + "@dhis2-ui/pagination" "8.16.0" + "@dhis2-ui/popover" "8.16.0" + "@dhis2-ui/popper" "8.16.0" + "@dhis2-ui/portal" "8.16.0" + "@dhis2-ui/radio" "8.16.0" + "@dhis2-ui/required" "8.16.0" + "@dhis2-ui/segmented-control" "8.16.0" + "@dhis2-ui/select" "8.16.0" + "@dhis2-ui/selector-bar" "8.16.0" + "@dhis2-ui/sharing-dialog" "8.16.0" + "@dhis2-ui/switch" "8.16.0" + "@dhis2-ui/tab" "8.16.0" + "@dhis2-ui/table" "8.16.0" + "@dhis2-ui/tag" "8.16.0" + "@dhis2-ui/text-area" "8.16.0" + "@dhis2-ui/tooltip" "8.16.0" + "@dhis2-ui/transfer" "8.16.0" + "@dhis2-ui/user-avatar" "8.16.0" + "@dhis2/ui-constants" "8.16.0" + "@dhis2/ui-forms" "8.16.0" + "@dhis2/ui-icons" "8.16.0" prop-types "^15.7.2" "@dnd-kit/accessibility@^3.0.0": From edcfe3eeae2c2b5969ae8661f17a0a3faa4ee09a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:13:02 +0100 Subject: [PATCH 14/20] chore(deps): bump @dhis2/d2-i18n from 1.1.1 to 1.1.3 (#3056) Bumps [@dhis2/d2-i18n](https://github.com/dhis2/d2-i18n) from 1.1.1 to 1.1.3. - [Release notes](https://github.com/dhis2/d2-i18n/releases) - [Changelog](https://github.com/dhis2/d2-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/d2-i18n/compare/v1.1.1...v1.1.3) --- updated-dependencies: - dependency-name: "@dhis2/d2-i18n" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d5f1ff205..434ddf0e5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-alerts": "^3.9.4", "@dhis2/app-service-datastore": "^1.0.0-beta.3", - "@dhis2/d2-i18n": "^1.1.1", + "@dhis2/d2-i18n": "^1.1.3", "@dhis2/maps-gl": "^3.8.6", "@dhis2/ui": "^8.16.0", "@krakenjs/post-robot": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index 23d87bf60..3192699f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2224,11 +2224,12 @@ resolved "https://registry.yarnpkg.com/@dhis2/cypress-plugins/-/cypress-plugins-10.0.3.tgz#83403aca333e2b356f7ea92c272d3ca00d00276d" integrity sha512-MYIkWI/kCR4hoqvD+spmbXcdoNL/EFX3HZuyRCGUErj5ChJmyWX7jQtDq/twd7GFRma0IqwTtOwaiKAxLRv/Nw== -"@dhis2/d2-i18n@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.1.tgz#acaca32cd00b60fd6b6f1dee571f2817a50e243c" - integrity sha512-X0jOCIKPaYv/2z0/sdkEvcbRiYu5o1FrOwvitiS6aKFxSL/GJ872I+UdHwpWJtL+yM7Z8E1epljazW0LnHUz0Q== +"@dhis2/d2-i18n@^1.1.1", "@dhis2/d2-i18n@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1" + integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA== dependencies: + "@types/i18next" "^11.9.0" i18next "^10.3" moment "^2.24.0" @@ -3513,6 +3514,11 @@ dependencies: "@types/node" "*" +"@types/i18next@^11.9.0": + version "11.9.3" + resolved "https://registry.yarnpkg.com/@types/i18next/-/i18next-11.9.3.tgz#04d84c6539908ad69665d26d8967f942d1638550" + integrity sha512-snM7bMKy6gt7UYdpjsxycqSCAy0fr2JVPY0B8tJ2vp9bN58cE7C880k20PWFM4KXxQ3KsstKM8DLCawGCIH0tg== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" From 03eed2d6fd3f697686183743ba30b079eb175f62 Mon Sep 17 00:00:00 2001 From: Adel Bensaad Date: Wed, 20 Dec 2023 16:16:16 +0100 Subject: [PATCH 15/20] fix: conditionally set PR title in dhis2-verify-app workflow (#3089) * fix: conditionally set PR title in dhis2-verify-app workflow * fix: conditionally set PR title in dhis2-verify-app workflow --- .github/workflows/dhis2-verify-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index d5a0d2598..d802dab9a 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -78,7 +78,7 @@ jobs: REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }} CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - PR_TITLE: ${{ github.event.pull_request.title }} + PR_TITLE: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || format('Direct push to {0}', github.ref_name) }} call-workflow-e2e-prod: if: "!contains(github.event.head_commit.message, '[skip ci]')" From e967e667d137089ad34657fe1ca827ee81145717 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:37:17 +0100 Subject: [PATCH 16/20] chore(deps): bump @babel/traverse from 7.21.2 to 7.23.2 (#3013) Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.2 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 115 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3192699f1..643b4e275 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,6 +33,14 @@ dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" @@ -68,7 +76,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.21.0", "@babel/generator@^7.21.1", "@babel/generator@^7.7.2": +"@babel/generator@^7.21.0", "@babel/generator@^7.7.2": version "7.21.1" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd" integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA== @@ -78,6 +86,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== + dependencies: + "@babel/types" "^7.23.0" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -143,6 +161,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + "@babel/helper-explode-assignable-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" @@ -158,6 +181,14 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" @@ -165,6 +196,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" @@ -248,16 +286,33 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-string-parser@^7.19.4": version "7.19.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -291,11 +346,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.21.2", "@babel/parser@^7.7.0": +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + +"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.7.0": version "7.21.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ== +"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" @@ -1088,19 +1157,28 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75" - integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw== +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.1" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.2" - "@babel/types" "^7.21.2" + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" + integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.0" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" debug "^4.1.0" globals "^11.1.0" @@ -1121,6 +1199,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" From 0fee930084b362c430364854420fd8f9595217e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:14:50 +0100 Subject: [PATCH 17/20] chore(deps-dev): bump eslint-plugin-cypress from 2.13.3 to 2.15.1 (#2979) Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.13.3 to 2.15.1. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.13.3...v2.15.1) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 434ddf0e5..455087cb8 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.7", "enzyme-to-json": "^3.6.2", - "eslint-plugin-cypress": "^2.13.3", + "eslint-plugin-cypress": "^2.15.1", "patch-package": "^6.5.1", "redux-devtools": "^3.7.0", "redux-mock-store": "^1.5.4", diff --git a/yarn.lock b/yarn.lock index 643b4e275..bbec74958 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7498,12 +7498,12 @@ eslint-module-utils@^2.7.4: dependencies: debug "^3.2.7" -eslint-plugin-cypress@^2.13.3: - version "2.13.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz#5fc1afdc939aaa7daa9181f651f2f35429733ff2" - integrity sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g== +eslint-plugin-cypress@^2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz#336afa7e8e27451afaf65aa359c9509e0a4f3a7b" + integrity sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w== dependencies: - globals "^11.12.0" + globals "^13.20.0" eslint-plugin-flowtype@^8.0.3: version "8.0.3" @@ -8677,15 +8677,15 @@ global-prefix@^3.0.0: kind-of "^6.0.2" which "^1.3.1" -globals@^11.1.0, globals@^11.12.0: +globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.19.0, globals@^13.6.0, globals@^13.9.0: - version "13.20.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" - integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== +globals@^13.19.0, globals@^13.20.0, globals@^13.6.0, globals@^13.9.0: + version "13.21.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" + integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== dependencies: type-fest "^0.20.2" From 008e7fe32508b403d251cb1b617c23c5feaf8063 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Wed, 20 Dec 2023 18:37:32 +0100 Subject: [PATCH 18/20] fix: report as MAP_VIEW not VISUALIZATION_VIEW (#3086) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Henrik Øverland --- src/util/apiDataStatistics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/apiDataStatistics.js b/src/util/apiDataStatistics.js index 0fb1c3813..aee50617c 100644 --- a/src/util/apiDataStatistics.js +++ b/src/util/apiDataStatistics.js @@ -2,7 +2,7 @@ export const dataStatisticsMutation = { resource: 'dataStatistics', params: ({ id }) => ({ favorite: id, - eventType: 'VISUALIZATION_VIEW', + eventType: 'MAP_VIEW', }), type: 'create', } From b45c23dce068ce5eae24fdb62612424f0b525169 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 07:50:15 +0100 Subject: [PATCH 19/20] chore(deps-dev): bump start-server-and-test from 2.0.1 to 2.0.3 (#3048) Bumps [start-server-and-test](https://github.com/bahmutov/start-server-and-test) from 2.0.1 to 2.0.3. - [Release notes](https://github.com/bahmutov/start-server-and-test/releases) - [Commits](https://github.com/bahmutov/start-server-and-test/compare/v2.0.1...v2.0.3) --- updated-dependencies: - dependency-name: start-server-and-test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jen Jones Arnesen --- package.json | 2 +- yarn.lock | 64 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 455087cb8..fda6639f6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "patch-package": "^6.5.1", "redux-devtools": "^3.7.0", "redux-mock-store": "^1.5.4", - "start-server-and-test": "^2.0.1" + "start-server-and-test": "^2.0.3" }, "dependencies": { "@dhis2/analytics": "^26.2.0", diff --git a/yarn.lock b/yarn.lock index bbec74958..9b416219c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4703,6 +4703,15 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" +axios@^1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" + integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axobject-query@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.1.1.tgz#3b6e5c6d4e43ca7ba51c5babf99d22a9c68485e1" @@ -8255,6 +8264,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -10437,10 +10451,10 @@ jest@^27.4.3: import-local "^3.0.2" jest-cli "^27.5.1" -joi@^17.7.0: - version "17.8.3" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.8.3.tgz#d772fe27a87a5cda21aace5cf11eee8671ca7e6f" - integrity sha512-q5Fn6Tj/jR8PfrLrx4fpGH4v9qM6o+vDUfD4/3vxxyg34OmKcNqYZ1qn2mpLza96S8tL0p0rIw2gOZX+/cTg9w== +joi@^17.11.0: + version "17.11.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.11.0.tgz#aa9da753578ec7720e6f0ca2c7046996ed04fc1a" + integrity sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -11422,7 +11436,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7, minimist@^1.2.8: +minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -13049,6 +13063,11 @@ proxy-from-env@1.0.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + ps-tree@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" @@ -14025,13 +14044,20 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.5.1, rxjs@^7.8.0: +rxjs@^7.5.1: version "7.8.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== dependencies: tslib "^2.1.0" +rxjs@^7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== + dependencies: + tslib "^2.1.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -14631,10 +14657,10 @@ stackframe@^1.3.4: resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== -start-server-and-test@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.1.tgz#e110e0b5a54c80963f65b9689c2c320ab8ac9025" - integrity sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ== +start-server-and-test@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-2.0.3.tgz#15c53c85e23cba7698b498b8a2598cab95f3f802" + integrity sha512-QsVObjfjFZKJE6CS6bSKNwWZCKBG6975/jKRPPGFfFh+yOQglSeGXiNWjzgQNXdphcBI9nXbyso9tPfX4YAUhg== dependencies: arg "^5.0.2" bluebird "3.7.2" @@ -14643,7 +14669,7 @@ start-server-and-test@^2.0.1: execa "5.1.1" lazy-ass "1.6.0" ps-tree "1.2.0" - wait-on "7.0.1" + wait-on "7.2.0" static-extend@^0.1.1: version "0.1.2" @@ -15974,16 +16000,16 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-on@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.0.1.tgz#5cff9f8427e94f4deacbc2762e6b0a489b19eae9" - integrity sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog== +wait-on@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.2.0.tgz#d76b20ed3fc1e2bebc051fae5c1ff93be7892928" + integrity sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ== dependencies: - axios "^0.27.2" - joi "^17.7.0" + axios "^1.6.1" + joi "^17.11.0" lodash "^4.17.21" - minimist "^1.2.7" - rxjs "^7.8.0" + minimist "^1.2.8" + rxjs "^7.8.1" walker@^1.0.7: version "1.0.8" From a3c4a091f3c8e504555b245cad4f182fd504cc20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 08:36:27 +0100 Subject: [PATCH 20/20] chore(deps): bump @reportportal/agent-js-jest from 5.0.6 to 5.0.7 (#3055) Bumps [@reportportal/agent-js-jest](https://github.com/reportportal/agent-js-jest) from 5.0.6 to 5.0.7. - [Release notes](https://github.com/reportportal/agent-js-jest/releases) - [Changelog](https://github.com/reportportal/agent-js-jest/blob/develop/CHANGELOG.md) - [Commits](https://github.com/reportportal/agent-js-jest/compare/v5.0.6...v5.0.7) --- updated-dependencies: - dependency-name: "@reportportal/agent-js-jest" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index fda6639f6..bf9f74bae 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@dhis2/ui": "^8.16.0", "@krakenjs/post-robot": "^11.0.0", "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop", - "@reportportal/agent-js-jest": "^5.0.6", + "@reportportal/agent-js-jest": "^5.0.7", "abortcontroller-polyfill": "^1.7.5", "array-move": "^4.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 9b416219c..707d578c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3055,18 +3055,18 @@ mocha "^10.2.0" node-ipc "9.1.1" -"@reportportal/agent-js-jest@^5.0.6": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@reportportal/agent-js-jest/-/agent-js-jest-5.0.6.tgz#336ed06c3c80d70bd8e50824bc3c883cb5d2548e" - integrity sha512-Gt2oOZ/k5HxZ2J3Hb6X43y6XZmvpldt3yM2wPdrU5CPhXb9hxdiZUl+e2MfI3y0aB+d6T/AkKcUyT7f91sZaYw== +"@reportportal/agent-js-jest@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@reportportal/agent-js-jest/-/agent-js-jest-5.0.7.tgz#e87382b4dffc5b01d54cfdca64bfdc70ece2bfeb" + integrity sha512-yqWcKi0UJSKUImfFClRTGGL14DE9RZW94YWnekfZXry4Rlh8y+zOgncV3qeE/2X2c5FHlvVUhZnkH/++RLvamw== dependencies: - "@reportportal/client-javascript" "^5.0.12" + "@reportportal/client-javascript" "^5.0.15" strip-ansi "^6.0.1" -"@reportportal/client-javascript@^5.0.12", "@reportportal/client-javascript@^5.0.14": - version "5.0.14" - resolved "https://registry.yarnpkg.com/@reportportal/client-javascript/-/client-javascript-5.0.14.tgz#48a40f2f33129d74bb7e451aaf25d44742e26fcc" - integrity sha512-4ge9ddOB1rFlzqI6j43qCw0cyjQOloiPChA1EFyF3dcV2BXHzGbh8S3SNhwxibvlQtV6piU8e0W9CLN4UWXvSA== +"@reportportal/client-javascript@^5.0.14", "@reportportal/client-javascript@^5.0.15": + version "5.0.15" + resolved "https://registry.yarnpkg.com/@reportportal/client-javascript/-/client-javascript-5.0.15.tgz#57080be5bdb347ab0019aeb385f9f282349f7ac4" + integrity sha512-ry6euqCOoJLXCUuBhlRMjCYKhbgU+9EYdZ8jpTuagoBVxS8V8nJed9ODnS4bXX61g+pJm+NP/0DrN2Ptq+DgQQ== dependencies: axios "^0.27.2" axios-retry "^3.4.0"