From 0b0c7cff10eef5035ac5e1b53406a7f2e5f66912 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 26 Nov 2023 02:38:09 +0100 Subject: [PATCH 01/22] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/cs.po | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/i18n/cs.po b/i18n/cs.po index fa3f0ab18..9962638fb 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -1,14 +1,14 @@ # # Translators: -# trendspotter , 2021 +# Jiří Podhorecký, 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: trendspotter , 2021\n" -"Language-Team: Czech (https://www.transifex.com/hisp-uio/teams/100509/cs/)\n" +"Last-Translator: Jiří Podhorecký, 2023\n" +"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -72,6 +72,12 @@ msgstr "Textová položka" msgid "Add text here" msgstr "Sem přidat text" +msgid "Filters are not applied to line list dashboard items" +msgstr "Filtry se nepoužívají na položky ovládacího panelu řádkového seznamu" + +msgid "Filters not applied" +msgstr "Filtry nejsou použity" + msgid "There was a problem loading this dashboard item" msgstr "Při načítání této položky ovládacího panelu došlo k problému" @@ -105,15 +111,33 @@ msgstr "Zobrazit jako mapu" msgid "There was a problem loading interpretations for this item" msgstr "Při načítání interpretací této položky došlo k problému" +msgid "The plugin for rendering this item is not available" +msgstr "Plugin pro vykreslení této položky není k dispozici" + +msgid "Install the {{appName}} app from the App Hub" +msgstr "Nainstalujte si aplikaci {{appName}} z App Hub" + +msgid "No data to display" +msgstr "Žádná data k zobrazení" + +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" +"Nainstalovat aplikaci Line Listing verze ${minLLVersion.join(\n" +" '.'\n" +" )} nebo vyšší pro zobrazení této položky." + +msgid "Show without filters" +msgstr "Zobrazit bez filtrů" + msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "Mapy s vrstvami Earth Engine nelze zobrazit v režimu offline" msgid "Unable to load the plugin for this item" msgstr "Nelze načíst plugin pro tuto položku" -msgid "No data to display" -msgstr "Žádná data k zobrazení" - msgid "There was an error loading data for this item" msgstr "Při načítání dat této položky došlo k chybě" @@ -141,6 +165,9 @@ msgstr "Zprávy o událostech" msgid "Event charts" msgstr "Grafy událostí" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "Aplikace" From 6a22f0868e6091dbfba07df32abf2afeb08fa08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Thu, 14 Dec 2023 16:17:20 +0100 Subject: [PATCH 02/22] chore: analytics (#2856) * 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 72f77c7f2..bd5cf52cb 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "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/d2-i18n": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index b6b4e5627..e0fdfd349 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2158,10 +2158,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 9d83c09ddd720a993a2eef9a820ba6914da9d20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:18:27 +0000 Subject: [PATCH 03/22] chore(deps): bump @adobe/css-tools from 4.3.1 to 4.3.2 Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e0fdfd349..10f0e73f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,9 +3,9 @@ "@adobe/css-tools@^4.3.0": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" - integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg== + version "4.3.2" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.2.tgz#a6abc715fb6884851fca9dad37fc34739a04fd11" + integrity sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw== "@ampproject/remapping@^2.1.0": version "2.2.0" From db5128acc043ac56d1a8be60c70216fc1ecec418 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 17 Dec 2023 02:38:51 +0100 Subject: [PATCH 04/22] fix(translations): sync translations from transifex (dev) Automatically merged. --- i18n/uz_UZ_Cyrl.po | 169 ++++++++++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 70 deletions(-) diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index b5375c94a..5596e92c3 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -1,13 +1,13 @@ # # Translators: -# Ibatov , 2021 +# Ibatov , 2023 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Ibatov , 2021\n" +"Last-Translator: Ibatov , 2023\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,22 +19,22 @@ msgid "Untitled dashboard" msgstr "Номсиз бошқарув панели" msgid "Cannot create a dashboard while offline" -msgstr "" +msgstr "Автоном режимда мониторинг панелини яратиб бўлмади" msgid "Create new dashboard" -msgstr "" +msgstr "Янги мониторинг панелини яратиш" msgid "Search for a dashboard" msgstr "Бошқариш панелида излаш" msgid "Show fewer dashboards" -msgstr "" +msgstr "Камроқ мониторинг панелини кўрсатиш" msgid "Show more dashboards" -msgstr "" +msgstr "Кўпроқ мониторинг панелини кўрсатиш" msgid "Remove this item" -msgstr "" +msgstr "Ушбу элементни олиб ташлаш" msgid "This item has been shortened to fit on one page" msgstr "Ушбу элемент бир саҳифага жойлаштириш учун мослаштирилди" @@ -49,10 +49,10 @@ msgid "See all messages" msgstr "Барча хабарларни кўриш" msgid "Item type \"{{type}}\" is not supported" -msgstr "" +msgstr "Элемент тури \"{{type}}\" қўллаб қувватланмади" msgid "The item type is missing" -msgstr "" +msgstr "Элемент тури мавжуд эмас" msgid "Filters applied" msgstr "Фильтр қўлланилди" @@ -74,33 +74,34 @@ msgstr "Матнни шу ерга қўшинг" msgid "Filters are not applied to line list dashboard items" msgstr "" +"Мониторинг панели элементлари қатори рўйхати учун фильтр қўллаб бўлмади" msgid "Filters not applied" -msgstr "" +msgstr "Фильтрлар қўлланилмади" msgid "There was a problem loading this dashboard item" msgstr "Ушбу панел элементлари юкланишида муаамога дуч келинди" msgid "Hide details and interpretations" -msgstr "" +msgstr "Деталлар ва тавсифларни яшириш" msgid "Show details and interpretations" -msgstr "" +msgstr "Деталлар ва тавсифларни кўрсатиш" msgid "Open in {{appName}} app" msgstr "Иловада {{ИловаНоми}} да очиш" msgid "View fullscreen" -msgstr "" +msgstr "Экранни тўлдириб кўрсатиш" msgid "This map can't be displayed as a chart" -msgstr "" +msgstr "Ушбу харитани диаграмма сифатида кўрсатиб бўлмайди" msgid "View as Chart" msgstr "Диаграмма сифатида кўриш" msgid "This map can't be displayed as a table" -msgstr "" +msgstr "Ушбу харитани жадвал сифатида кўратиб бўлмайди" msgid "View as Table" msgstr "Жадвал сифатида кўриш" @@ -109,13 +110,13 @@ msgid "View as Map" msgstr "Харита сифатида кўриш" msgid "There was a problem loading interpretations for this item" -msgstr "" +msgstr "Ушбу элемент тавсифини юклашда хатолик юз берди" msgid "The plugin for rendering this item is not available" -msgstr "" +msgstr "Ушбу элементни кўрсатиш учун плагин мавжуд эмас" msgid "Install the {{appName}} app from the App Hub" -msgstr "" +msgstr "App Hub дан {{appName}} иловасини ўрнатинг" msgid "No data to display" msgstr "Маълумот экранга чиқарилмади" @@ -125,21 +126,25 @@ msgid "" " '.'\n" " )} or higher in order to display this item." msgstr "" +"Ушбу элементни кўрсатиш учун Line Listing иловасининг ${minLLVersion.join( " +"'.' )} ёки юқори версиясини ўрнатинг." msgid "Show without filters" -msgstr "" +msgstr "Фильтрларсиз кўрсатиш" msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "" +"Оффлайн ҳолатда Earth Engine қаватлари ва хариталарни экранда кўрсатиш " +"имкони мавжуд эмас" msgid "Unable to load the plugin for this item" msgstr "Ушбу элемент учун плагин юкланмади" msgid "There was an error loading data for this item" -msgstr "" +msgstr "Ушбу элемент маълумотларини юклашда хатолик юз берди" msgid "Open this item in {{appName}}" -msgstr "" +msgstr " {{appName}}да ушбу элементни очмоқ" msgid "Not available offline" msgstr "Оффлайн режимда мавжуд эмас" @@ -163,7 +168,7 @@ msgid "Event charts" msgstr "Ҳодисалар диаграммаларда" msgid "Line lists" -msgstr "" +msgstr "Қаторлар рўйхати" msgid "Apps" msgstr "Илова" @@ -180,20 +185,21 @@ msgstr "Фойдаланувчилар" msgid "" "Failed to save dashboard. You might be offline or not have access to edit " "this dashboard." -msgstr "" +msgstr "Бошқарув панели сақланмади. Сиз оффлайн ёки бу ҳуқуқга эга эмассиз." msgid "" "Failed to save dashboard. This code is already being used on another " "dashboard." msgstr "" +"Бошқарув панели сақланмади. Бу код аллақачон асбоблар панелида ишлатилмоқда." msgid "" "Failed to delete dashboard. You might be offline or not have access to edit " "this dashboard." -msgstr "" +msgstr "Бошқарув панели ўчирилмади. Сиз оффлайн ёки бу ҳуқуқга эга эмассиз." msgid "Cannot save this dashboard while offline" -msgstr "" +msgstr "Офллайн режимда ушбу панел сақланмади" msgid "Save changes" msgstr "Ўзгартиришни сақлаш" @@ -205,13 +211,13 @@ msgid "Print preview" msgstr "Чоп этишдан аввалги кўрик" msgid "Filter settings" -msgstr "" +msgstr "Фильтр созламалари" msgid "Translate" msgstr "Таржима қилинг" msgid "Cannot delete this dashboard while offline" -msgstr "" +msgstr "Офллайн режимда ушбу панел ўчирилмади" msgid "Delete" msgstr "Ўчириб ташлаш" @@ -245,32 +251,36 @@ msgid "" "This dashboard has unsaved changes. Are you sure you want to leave and " "discard these unsaved changes?" msgstr "" +"Ушбу асбоблар панелида сақланмаган ўзгартиришлар мавжуд. Ҳақиқатдан ҳам ушбу" +" сақланмаган ўзгартиришларни тарк этиш ва бекор қилишни хохлайсизми?" msgid "No, stay here" msgstr "Йўқ, саҳифада қолиш" msgid "Yes, discard changes" -msgstr "" +msgstr "Ҳа, ўзгартиришлар бекор қилинсин" msgid "No access" msgstr "Кириш ҳуқуқи мавжуд эмас" msgid "Not supported" -msgstr "" +msgstr "Қўллаб қувватланмади" msgid "" "Editing dashboards on small screens is not supported. Resize your screen to " "return to edit mode." msgstr "" +"Кичрайтирилган экранда асбоблар панелини ўзгартириш қўллаб қувватланмайди. " +"Таҳрирлаш режимига ўтиш учун экран ўлчамини ўзгартиринг." msgid "Allow filtering by all dimensions" -msgstr "" +msgstr "Барча ўлчамлар бўйича фильтрлашга рухсат бериш" msgid "Only allow filtering by selected dimensions" -msgstr "" +msgstr "Фақат танланган ўлчамлар бўйича фильтрлашга ручсат бериш" msgid "Dashboard filter settings" -msgstr "" +msgstr "Бошқарув панели фильтр созламалари" msgid "" "Dashboards can be filtered by dimensions to change\n" @@ -278,12 +288,16 @@ msgid "" " as filters. Alternatively, only selected dimensions can\n" " be made available on a dashboard." msgstr "" +"Кўрсатиладиган маълумотларни ўзгартириш учун асбоблар панелида ўлчамлар " +"бўйича фильтрлаш мумкин. Одатда балча ўлчамлар фильтрлаш учун " +"мослаштирилган. Алтернатив шаклда асбоблар панелида фақат танланганлар учун " +"фильтр созлаш мумкин." msgid "Available Filters" -msgstr "" +msgstr "Мавжуд фильтрлар" msgid "Selected Filters" -msgstr "" +msgstr "Танланган фильтрлар" msgid "Confirm" msgstr "Тасдиқланг" @@ -304,10 +318,10 @@ msgid "Search for items to add to this dashboard" msgstr "Ушбу бошқарув панелига киритиш учун элементларни қидиринг" msgid "Search for visualizations, reports and more" -msgstr "" +msgstr "Визуализация, ҳисобот ва бошқалар учун излаш" msgid "Cannot search for dashboard items while offline" -msgstr "" +msgstr "Офллайн режимда асбоблар панели элементларини излаш имконсиз" msgid "Additional items" msgstr "Қўшимча элементлар" @@ -319,44 +333,50 @@ msgid "Dashboard layout" msgstr "Бошқарув панели макети" msgid "Freeflow" -msgstr "" +msgstr "Эркин оқим" msgid "Dashboard items can be placed anywhere, at any size." msgstr "" +"Ахборот панели элементларини хохлаган жойда ва ўлчамда жойлаштириш мумкин" msgid "Fixed columns" -msgstr "" +msgstr "Белгиланган устунлар" msgid "" "Dashboard items are automatically placed within fixed, horizontal columns. " "The number of columns can be adjusted." msgstr "" +"Бошқарув панели элементлари автоматик равишда горизонтал устунлар ичида " +"жойлаштирилади. Устунлар сонини созлаш мумкин." msgid "Number of columns" -msgstr "" +msgstr "Устунлар сони" msgid "Gap size between columns (px)" -msgstr "" +msgstr "Устунлар орасидаги масофа ўлчами (px)" msgid "" "Default height only applies to items added to a dashboard, this setting will" " not change existing items" msgstr "" +"Баландлик стандарт ҳолатда фақатгина мониторинг панелига қўшилган " +"элементларга қўлланилади; бу параметр мавжуд элементларни ўзгартирмайди." msgid "Default height for items added to dashboard (rows)" msgstr "" +"Мониторинг панелига қўшилган элементлар учун стандарт баландлик (сатрлар)" msgid "Save layout" -msgstr "" +msgstr "Макетни сақлаш" msgid "Dashboard title" msgstr "Бошқарув панели номланиши" msgid "Dashboard code" -msgstr "" +msgstr "Бошқарув панели коди" msgid "Code can't be longer than 50 characters" -msgstr "" +msgstr "Код 50 та белгидан ошмаслиги керак" msgid "Dashboard description" msgstr "Бошқарув панели тавсифи" @@ -366,19 +386,19 @@ msgstr "Жойлашиш тартиби" msgid "{{count}} columns" msgid_plural "{{count}} columns" -msgstr[0] "" +msgstr[0] "{{count}} устунлар" msgid "Change layout" -msgstr "" +msgstr "Макетни ўзгартириш" msgid "Add new items to" -msgstr "" +msgstr "Янги элементни қўшиш" msgid "End of dashboard" -msgstr "" +msgstr "Бошқарув панели охири" msgid "Start of dashboard" -msgstr "" +msgstr "Бошқарув панели боши" msgid "Print" msgstr "Чоп этиш" @@ -407,23 +427,27 @@ msgid "" "Use A4 landscape paper size, default margin settings and turn on background " "graphics in the browser print dialog" msgstr "" +"Браузернинг принт диалог саҳифасида қўдданг; А4 қоғоз альбом варианти, " +"чегаралр стандарт созламалари ва фон графикасини ёқинг." msgid "Getting started" msgstr "Иш бошланганида" msgid "Search for and open saved dashboards from the top bar." -msgstr "" +msgstr "Информацион панелининг юқори қисмидан изланг ва очинг." msgid "" "Click a dashboard chip to open it. Get back to this screen from the \"More\"" " menu." msgstr "" +"Асбоблар панелини очиш учун босинг. Бу энранга менюдаги \"Яна\" тугмаси " +"орқали қайтинг." msgid "Create a new dashboard with the + button." -msgstr "" +msgstr "Янги бошқарув панели + тугмаси орқали яратинг." msgid "Your most viewed dashboards" -msgstr "" +msgstr "Сизнинг энг кўп кўрилган ахборот панелларингиз" msgid "No dashboards found. Use the + button to create a new dashboard." msgstr "" @@ -438,39 +462,42 @@ msgid_plural "{{count}} selected" msgstr[0] "{{жами}} танланган" msgid "Cannot remove filters while offline" -msgstr "" +msgstr "Офллайн режимда фильтрни ўчириб бўлмайди" msgid "Removing filters while offline" -msgstr "" +msgstr "Оффлайн режимда фильтрни ўчириш" msgid "" "Removing this filter while offline will remove all other filters. Do you " "want to remove all filters on this dashboard?" msgstr "" +"Ушбу фильтрни оффлайн режимда ўчириш, барча фильтрларни ўчирилишига олиб " +"келади. Сиз барча фильтрларни ахборот панелидан ўчиришни хохлайсизми?" msgid "No, cancel" msgstr "Йўқ, бекор қилинг" msgid "Yes, remove filters" -msgstr "" +msgstr "Ҳа, фильтрларни ўчириш" msgid "The dashboard couldn't be made available offline. Try again." msgstr "" +"Бошқарув панелини оффлайн режимда ишлатиб бўлмади. Қайта уриниб кўринг." msgid "Failed to unstar the dashboard" -msgstr "" +msgstr "Бошқарув панелидаги белги олиб ташланмади" msgid "Failed to star the dashboard" -msgstr "" +msgstr "Бошқарув панелида белги қўйиб бўлмади" msgid "Remove from offline storage" -msgstr "" +msgstr "Оффлайн базасидан олиб ташлаш" msgid "Make available offline" -msgstr "" +msgstr "Оффлайн режимида фойдаланиш мумкин" msgid "Sync offline data now" -msgstr "" +msgstr "Маълумотларни оффлайн режимда синхронлаш" msgid "Unstar dashboard" msgstr "Бошқарув панелидаги юлдузча ўчирилади" @@ -488,7 +515,7 @@ msgid "One item per page" msgstr "Ҳар бир саҳифада битта элемент" msgid "Close dashboard" -msgstr "" +msgstr "Бошқарув панелини ёпиш" msgid "More" msgstr "Кўпроқ" @@ -500,15 +527,17 @@ msgid "Share" msgstr "Улашиш" msgid "Clear dashboard filters?" -msgstr "" +msgstr "Бошқарув панели фильтрларини тозалаш керакми?" msgid "" "A dashboard's filters can’t be saved offline. Do you want to remove the " "filters and make this dashboard available offline?" msgstr "" +"Бошқарув панели фильтрларини оффлайн режимда сақлаш имконсиз. Фильтрларни " +"олиб ташлаб, бу асбоблар панелидан оффлайн режимда фойдаланишни хохлайсизми?" msgid "Yes, clear filters and sync" -msgstr "" +msgstr "Ҳа, фильтрни ва синхронлашни тозалаш" msgid "No description" msgstr "Тавсиф йўқ" @@ -517,31 +546,31 @@ msgid "Add filter" msgstr "Фильтр киритиш" msgid "Offline data last updated {{time}}" -msgstr "" +msgstr "Оффлайн режимда охирги марта янгиланган маълумотлар {{time}}" msgid "Cannot unstar this dashboard while offline" -msgstr "" +msgstr "Оффлайн режимда бошқарув панелида белгиларни ўчириб бўлмайди" msgid "Cannot star this dashboard while offline" -msgstr "" +msgstr "Оффлайн режимда бошқарув панелида белгилар қўйиб бўлмайди" msgid "Loading dashboard – {{name}}" msgstr "Бошқарув панели юкланмоқда - {{исми}}" msgid "Loading dashboard" -msgstr "" +msgstr "Бошқарув панели юкланмоқда" msgid "Offline" msgstr "Оффлайн" msgid "This dashboard cannot be loaded while offline." -msgstr "" +msgstr "Бошқарув панелини оффлайн режимда юклаб бўлмайди" msgid "Go to start page" -msgstr "" +msgstr "Бошланғич саҳифага ўтиш" msgid "Load dashboard failed" -msgstr "" +msgstr "Бошқарув панели юкланмади" msgid "This dashboard could not be loaded. Please try again later." -msgstr "" +msgstr "Бошқарув панели юкланмади. Илтимос, кейинроқ қайта уриниб кўринг" From 4d43b23010efc4ffc9f731be66793abd8c6c467c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:59:16 +0100 Subject: [PATCH 05/22] chore(deps): bump browserify-sign from 4.2.1 to 4.2.2 (#2807) 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> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 10f0e73f5..6ed92f89e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4902,11 +4902,16 @@ 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: version "5.2.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== +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== + body-parser@1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" @@ -5076,7 +5081,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== @@ -5085,19 +5090,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" @@ -7210,7 +7215,7 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -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== @@ -12185,7 +12190,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== @@ -13665,6 +13670,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +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== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" From 3518e6451130cb9439d55b57abf353c8fc3dc8c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:59:41 +0100 Subject: [PATCH 06/22] chore(deps): bump crypto-js from 4.1.1 to 4.2.0 (#2806) 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> Co-authored-by: Jen Jones Arnesen --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6ed92f89e..dfcf04c85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6245,9 +6245,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 166186bbf93fc5fce8ce0c30f1d8488480cb10b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:00:06 +0100 Subject: [PATCH 07/22] chore(deps): bump get-func-name from 2.0.0 to 2.0.2 (#2748) Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/chaijs/get-func-name/releases) - [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2) --- updated-dependencies: - dependency-name: get-func-name 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index dfcf04c85..93972cb82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8517,9 +8517,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" + integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: version "1.2.0" From 34bf16e30ff864d6b560b7db16d5e53893493aff Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Tue, 23 Jan 2024 10:01:54 +0100 Subject: [PATCH 08/22] chore: use the repo default branch for dependabot (#2887) --- .github/dependabot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ce57a13d7..51a5c167d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,5 +5,4 @@ updates: schedule: interval: weekly open-pull-requests-limit: 10 - target-branch: master versioning-strategy: increase From 252a0cf3dc286c8c808eaa3ef517322f5ef5b60e Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Tue, 23 Jan 2024 10:54:00 +0100 Subject: [PATCH 09/22] chore: include patch packages in cache-key (#2855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related to https://dhis2.atlassian.net/browse/LIBS-383 Add package patches to the yarn cache key. If a new patch is added, then this ensures that that the yarn cache gets invalidated and forces yarn install, which will then do the postinstall step that applies the patches. From user perspective, the e2e-prod tests might fail if it is depending on a patch that didn't get installed. Co-authored-by: Jan Henrik Øverland --- .github/workflows/dhis2-verify-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 94079da06..76626630b 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -94,7 +94,7 @@ jobs: id: yarn-cache with: path: '**/node_modules' - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} - name: End-to-End tests uses: cypress-io/github-action@v2 @@ -104,7 +104,7 @@ jobs: start: ${{ env.SERVER_START_CMD }} wait-on: ${{ env.SERVER_URL }} wait-on-timeout: 300 - cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }} group: 'e2e' tag: ${{ github.event_name }} env: From b99c5ac972e64a3539770272766d19ffba8369ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:54:38 +0100 Subject: [PATCH 10/22] chore(deps): bump react-redux from 7.2.4 to 7.2.9 (#2893) Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.4 to 7.2.9. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.4...v7.2.9) --- updated-dependencies: - dependency-name: react-redux 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 | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index bd5cf52cb..8b16a1fd0 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "react": "^16.14.0", "react-dom": "^16.13.1", "react-grid-layout": "1.2.2", - "react-redux": "^7.2.4", + "react-redux": "^7.2.9", "react-router-dom": "^5.2.0", "redux": "^4.1.0", "redux-logger": "^3.0.6", diff --git a/yarn.lock b/yarn.lock index 93972cb82..2c47353d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3645,10 +3645,10 @@ dependencies: "@types/react" "^17" -"@types/react-redux@^7.1.16": - version "7.1.18" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" - integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== +"@types/react-redux@^7.1.20": + version "7.1.33" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" + integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -13415,7 +13415,7 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1: +react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -13467,17 +13467,17 @@ react-redux@^5.0.7: react-is "^16.6.0" react-lifecycles-compat "^3.0.0" -react-redux@^7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225" - integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== +react-redux@^7.2.9: + version "7.2.9" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d" + integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ== dependencies: - "@babel/runtime" "^7.12.1" - "@types/react-redux" "^7.1.16" + "@babel/runtime" "^7.15.4" + "@types/react-redux" "^7.1.20" hoist-non-react-statics "^3.3.2" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.13.1" + react-is "^17.0.2" react-refresh@^0.11.0: version "0.11.0" From 56fcaa4f54db13cc5153643e689461f7af430abe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:55:08 +0100 Subject: [PATCH 11/22] chore(deps): bump moment from 2.29.4 to 2.30.1 (#2892) Bumps [moment](https://github.com/moment/moment) from 2.29.4 to 2.30.1. - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.29.4...2.30.1) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production 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 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8b16a1fd0..3bf7f9f76 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "d2-utilizr": "^0.2.16", "i18next": "^20.3.5", "lodash": "^4.17.21", - "moment": "^2.29.4", + "moment": "^2.30.1", "react": "^16.14.0", "react-dom": "^16.13.1", "react-grid-layout": "1.2.2", diff --git a/yarn.lock b/yarn.lock index 2c47353d5..700f8c8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11597,10 +11597,10 @@ module-deps@^6.0.0, module-deps@^6.2.3: through2 "^2.0.0" xtend "^4.0.0" -moment@^2.24.0, moment@^2.29.1, moment@^2.29.4: - version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" - integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +moment@^2.24.0, moment@^2.29.1, moment@^2.30.1: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== ms@2.0.0: version "2.0.0" From 06e0eb3e9ee337a0dc704df07aa6f232ea9fe0d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:48:46 +0100 Subject: [PATCH 12/22] chore(deps): bump @dhis2/d2-i18n from 1.1.1 to 1.1.3 (#2896) 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> --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3bf7f9f76..b71a87c0a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@dhis2/analytics": "^26.2.0", "@dhis2/app-runtime": "^3.9.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", - "@dhis2/d2-i18n": "^1.1.1", + "@dhis2/d2-i18n": "^1.1.3", "@dhis2/d2-ui-core": "^7.4.3", "@dhis2/d2-ui-interpretations": "^7.4.3", "@dhis2/d2-ui-mentions-wrapper": "^7.4.3", diff --git a/yarn.lock b/yarn.lock index 700f8c8eb..b220d78ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2376,11 +2376,12 @@ dependencies: jscodeshift "^0.11.0" -"@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" @@ -3546,6 +3547,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.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" From 201d6738de63b5fb37b7214e03f828961b7c8ae9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:23:49 +0100 Subject: [PATCH 13/22] chore(deps): bump @babel/traverse from 7.18.13 to 7.23.2 (#2796) Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.13 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 | 129 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 117 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index b220d78ad..d0e1f6b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,6 +38,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.18.8": version "7.18.13" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483" @@ -102,6 +110,16 @@ "@jridgewell/gen-mapping" "^0.3.2" 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" @@ -165,6 +183,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" @@ -180,6 +203,14 @@ "@babel/template" "^7.18.6" "@babel/types" "^7.18.9" +"@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" @@ -187,6 +218,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.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" @@ -269,16 +307,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.18.10": version "7.18.10" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== +"@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": 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.14.5", "@babel/helper-validator-option@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" @@ -312,11 +367,25 @@ chalk "^2.0.0" js-tokens "^4.0.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.18.10", "@babel/parser@^7.18.13", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0": version "7.18.13" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4" integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg== +"@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" @@ -1225,19 +1294,28 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68" - integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA== +"@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.18.13" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.18.13" - "@babel/types" "^7.18.13" + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9", "@babel/traverse@^7.4.5", "@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" @@ -1258,6 +1336,15 @@ "@babel/helper-validator-identifier" "^7.18.6" 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" @@ -2941,6 +3028,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" @@ -2959,6 +3051,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.14": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9": version "0.3.15" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" @@ -2967,6 +3064,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/trace-mapping@^0.3.17": + version "0.3.20" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" + integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + "@js-temporal/polyfill@^0.4.2": version "0.4.4" resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.4.tgz#4c26b4a1a68c19155808363f520204712cfc2558" From 7a12d984249e091cd0d83b6d0715ad0479cadaf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 09:25:11 +0000 Subject: [PATCH 14/22] chore(deps): bump @dhis2/app-runtime from 3.9.4 to 3.10.2 (#2890) * chore(deps): bump @dhis2/app-runtime from 3.9.4 to 3.10.2 Bumps [@dhis2/app-runtime](https://github.com/dhis2/app-runtime/tree/HEAD/runtime) from 3.9.4 to 3.10.2. - [Release notes](https://github.com/dhis2/app-runtime/releases) - [Changelog](https://github.com/dhis2/app-runtime/blob/master/CHANGELOG.md) - [Commits](https://github.com/dhis2/app-runtime/commits/v3.10.2/runtime) --- updated-dependencies: - dependency-name: "@dhis2/app-runtime" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * chore(deps): bump @dhis2/d2-i18n from 1.1.1 to 1.1.3 (#2896) 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> * chore(deps): bump @babel/traverse from 7.18.13 to 7.23.2 (#2796) Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.13 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 --------- 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 | 108 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 81 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index b71a87c0a..1258ca5a2 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "BSD-3-Clause", "dependencies": { "@dhis2/analytics": "^26.2.0", - "@dhis2/app-runtime": "^3.9.4", + "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", "@dhis2/d2-ui-core": "^7.4.3", diff --git a/yarn.lock b/yarn.lock index d0e1f6b5e..9f457578b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2281,40 +2281,48 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.9.0", "@dhis2/app-runtime@^3.9.4": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.4.tgz#88243dbb9a4a805be744a61cffd13a4c3d2d031d" - integrity sha512-CBwMXer5/Kcxf6MgfwPgpEaUSXbDXzwItCkH3i0nsjmkD0KIaEOZ6Y1pQL+/5RYnziZ5glYCFWsCKn0eCJrdJg== - dependencies: - "@dhis2/app-service-alerts" "3.9.4" - "@dhis2/app-service-config" "3.9.4" - "@dhis2/app-service-data" "3.9.4" - "@dhis2/app-service-offline" "3.9.4" - -"@dhis2/app-service-alerts@3.9.4": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.4.tgz#5aed2b191bb98bbf5eb14babb495b70f28b69aff" - integrity sha512-Oq2PZMcYyB+uXNwmifclv8oVobuKLTfN9ia7Gwa5G63c7Zjl4HldOxrM3TGDnsGYWfuGxtm8LNuzKfFX91HWmg== - -"@dhis2/app-service-config@3.9.4": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.9.4.tgz#4cab3a4ba090e53235f01c6a6913467171052d89" - integrity sha512-hiJr33zNWjUWJDx8l7tFMDfzX11euE+t6+ph2x9LnQ9KHDXFhh3GZhyQnX+8IATtlS4Fx9fjz2scQhGsg2dt0g== - -"@dhis2/app-service-data@3.9.4": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.9.4.tgz#03cd4cc40a316670d5ae328488cc8ef2a8a9b377" - integrity sha512-3AFwBkR1H8M6b+T5N3vcRsx9iiJm5LjltXYkbA9fmxcjJ02VoHa2B3a529pp8w9qSp7mpAF4Kmr3gZPvFpBRDA== +"@dhis2/app-runtime@^3.10.2", "@dhis2/app-runtime@^3.9.0": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.10.2.tgz#e82639bd68234bdeaf2f6d3c256dcdfcdd267da2" + integrity sha512-GiftKk8ZTXlPElXAgVJn41Vj6E1vEGTPGrjrqU7j41ZTYsg+tUcCkISNt1woe5l7E+8+y+9Fy4bgqSsBOAEUvg== + dependencies: + "@dhis2/app-service-alerts" "3.10.2" + "@dhis2/app-service-config" "3.10.2" + "@dhis2/app-service-data" "3.10.2" + "@dhis2/app-service-offline" "3.10.2" + "@dhis2/app-service-plugin" "3.10.2" + +"@dhis2/app-service-alerts@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.10.2.tgz#0e07c3530606f81ab998a20f2c478600b6027a77" + integrity sha512-2IqaawnlOzYVJLBF2AKVQJ4cuxJNZD7FK0XE0XOv1WwFs70h6bp23MQueIJ/QHxLo7lamE0FC22m4diM4P0CuA== + +"@dhis2/app-service-config@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.10.2.tgz#be52676068e31cdb1fe3f8ddabb8153e1cd6e3e6" + integrity sha512-Crw7Tx4yg4qWw3qYxNCIye77IaY2HUYyDmDKPVVWzgmrcSGxpunv/NtsUg12pxrVfVLnqlH9L6AF9A6hO0afmw== + +"@dhis2/app-service-data@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.10.2.tgz#e94d45d87cab5e156decfe9e92e3153e5df68ba0" + integrity sha512-+ESLrVEDQKXBaQmpaCq78RonkqJM2BliykaO4QBeOc4ilWohaqYajue1Ntg4uV2KrdkCylBdMDwGYjsak0G7hg== dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.9.4": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.9.4.tgz#ba4f3a916ca9a4c714fdedac51c66daa4f2c6bd7" - integrity sha512-vtv9V3Za/ukujPpqBRGkKZTloM2Cu29J+zHziyrTKC+hVsw8p3d4dHgXvpOGLcjq3ePAvEX4aEZK9+VCHnNFRQ== +"@dhis2/app-service-offline@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.10.2.tgz#082279b7045e702c2eecda751d762225313156b0" + integrity sha512-bTp+CCRbyKt/0QADj0O6wLNWhi+6QDkjt2+sfpv3M8oKcftjaQDqedVoypZRA0nqvSdVL2ehtTzqMrrxu6jtZQ== dependencies: lodash "^4.17.21" +"@dhis2/app-service-plugin@3.10.2": + version "3.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-plugin/-/app-service-plugin-3.10.2.tgz#09de64ee59017c86c8dab96a0d2ca0d915ae9d31" + integrity sha512-FqR6ILmvAXT2n1SzCZknT+5jJRdajg1dBegWAu3xqZXAntsM4wvFLCx6EtjS5LO2Kga9VZ+TJmVr2UFX1330CQ== + dependencies: + post-robot "^10.0.46" + "@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" @@ -4947,6 +4955,15 @@ becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0: resolved "https://registry.yarnpkg.com/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz#429ceebbfa5f7e936e78d73fbdc7da7162b20e20" integrity sha1-Qpzuu/pffpNueNc/vcfacWKyDiA= +belter@^1.0.41: + version "1.0.190" + resolved "https://registry.yarnpkg.com/belter/-/belter-1.0.190.tgz#491857550ef240d9c66b56fc637991f5c3089966" + integrity sha512-jz05FHrO+bwitdI6JxV5ESyRdVhTcwMWQ7L4o+q/R4LNJFQrG58sp9EiwsSjhbihhiyYFcmmCMRRagxte6igtw== + dependencies: + cross-domain-safe-weakmap "^1" + cross-domain-utils "^2" + zalgo-promise "^1" + bfj@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" @@ -6309,6 +6326,20 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-domain-safe-weakmap@^1, cross-domain-safe-weakmap@^1.0.1: + version "1.0.29" + resolved "https://registry.yarnpkg.com/cross-domain-safe-weakmap/-/cross-domain-safe-weakmap-1.0.29.tgz#0847975c27d9e1cc840f24c1745311958df98022" + integrity sha512-VLoUgf2SXnf3+na8NfeUFV59TRZkIJqCIATaMdbhccgtnTlSnHXkyTRwokngEGYdQXx8JbHT9GDYitgR2sdjuA== + dependencies: + cross-domain-utils "^2.0.0" + +cross-domain-utils@^2, cross-domain-utils@^2.0.0: + version "2.0.38" + resolved "https://registry.yarnpkg.com/cross-domain-utils/-/cross-domain-utils-2.0.38.tgz#2eaf321c4dfdb61596805ca4233fde4400cb6377" + integrity sha512-zZfi3+2EIR9l4chrEiXI2xFleyacsJf8YMLR1eJ0Veb5FTMXeJ3DpxDjZkto2FhL/g717WSELqbptNSo85UJDw== + dependencies: + zalgo-promise "^1.0.11" + cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -12561,6 +12592,17 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +post-robot@^10.0.46: + version "10.0.46" + resolved "https://registry.yarnpkg.com/post-robot/-/post-robot-10.0.46.tgz#39cea5b51033729390fc7c90be3285cd285f0377" + integrity sha512-EgVJiuvI4iRWDZvzObWes0X/n8olWBEJWxlSw79zmhpgkigX8UsVL4VOBhVtoJKwf0Y9qP9g2zOONw1rv80QbA== + dependencies: + belter "^1.0.41" + cross-domain-safe-weakmap "^1.0.1" + cross-domain-utils "^2.0.0" + universal-serialize "^1.0.4" + zalgo-promise "^1.0.3" + postcss-attribute-case-insensitive@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741" @@ -16064,6 +16106,11 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" +universal-serialize@^1.0.4: + version "1.0.10" + resolved "https://registry.yarnpkg.com/universal-serialize/-/universal-serialize-1.0.10.tgz#3279bb30f47290ea479f45135620f98fa9d3f3a6" + integrity sha512-FdouA4xSFa0fudk1+z5vLWtxZCoC0Q9lKYV3uUdFl7DttNfolmiw2ASr5ddY+/Yz6Isr68u3IqC9XMSwMP+Pow== + universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16983,6 +17030,11 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +zalgo-promise@^1, zalgo-promise@^1.0.11, zalgo-promise@^1.0.3: + version "1.0.48" + resolved "https://registry.yarnpkg.com/zalgo-promise/-/zalgo-promise-1.0.48.tgz#9e33eef502d5ed9f5a09fc5728c833c3e87afa2e" + integrity sha512-LLHANmdm53+MucY9aOFIggzYtUdkSBFxUsy4glTTQYNyK6B3uCPWTbfiGvSrEvLojw0mSzyFJ1/RRLv+QMNdzQ== + zip-stream@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.3.tgz#26cc4bdb93641a8590dd07112e1f77af1758865b" From c2798d095127735161cb1a216399dd7a6a2fa59a Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Wed, 14 Feb 2024 15:14:17 +0100 Subject: [PATCH 15/22] chore: include release notes in slackbot message (#2911) --- .github/workflows/dhis2-verify-app.yml | 41 ++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 76626630b..2e6fd08a9 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -126,7 +126,7 @@ jobs: if: | !github.event.push.repository.fork && github.actor != 'dependabot[bot]' && - github.event_name != 'pull_request' + github.ref == 'refs/heads/master' steps: - uses: actions/checkout@v3 with: @@ -196,8 +196,9 @@ jobs: needs: release if: | success() && - !cancelled() && - github.ref == 'refs/heads/master' + !cancelled() && + github.ref == 'refs/heads/master' && + contains(github.event.head_commit.message, 'chore(release)') steps: - name: Checkout code uses: actions/checkout@master @@ -213,13 +214,41 @@ jobs: channel-id: ${{ secrets.SLACK_CHANNEL_ID }} payload: | { - "text": ":large_green_circle: :dashboard-app: :tada: Dashboard app release succeeded for version: ${{ steps.extract_version.outputs.version }}", + "text": "Dashboard app release ${{ steps.extract_version.outputs.version }} succeeded", "blocks": [ + { + "type": "header", + "text": { + "type": "plain_text", + "text": ":large_green_circle: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} released :tada:", + "emoji": true + } + }, + { + "type": "divider" + }, { "type": "section", "text": { - "type": "mrkdwn", - "text": ":large_green_circle: :dashboard-app: :tada: Dashboard version ${{ steps.extract_version.outputs.version }} released " + "type": "mrkdwn", + "text": "*Release Notes*" + } + }, + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": ${{ toJSON(github.event.head_commit.message) }} + } + }, + { + "type": "divider" + }, + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "Link to " } } ] From c3110d816c7f62465a1cdd528aacc3817a3d5db0 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 28 Feb 2024 11:38:12 +0100 Subject: [PATCH 16/22] fix(translations): sync translations from transifex (dev) (#2920) --- i18n/ar.po | 40 +++++++++++++++++++++++++++++-------- i18n/ar_IQ.po | 43 ++++++++++++++++++++++++++++++--------- i18n/es.po | 12 +++++------ i18n/es_419.po | 8 ++++---- i18n/fr.po | 22 ++++++++++---------- i18n/nb.po | 5 +++-- i18n/pt.po | 40 +++++++++++++++++++++++++++++-------- i18n/pt_BR.po | 47 +++++++++++++++++++++++++++++++++---------- i18n/uk.po | 6 +++--- i18n/uz_UZ_Cyrl.po | 13 ++++++------ i18n/uz_UZ_Latn.po | 5 +++-- i18n/vi.po | 50 ++++++++++++++++++++++++++++++++++------------ 12 files changed, 208 insertions(+), 83 deletions(-) diff --git a/i18n/ar.po b/i18n/ar.po index e92a666a3..132655ac4 100644 --- a/i18n/ar.po +++ b/i18n/ar.po @@ -1,16 +1,16 @@ # # Translators: # Viktor Varland , 2020 -# phil_dhis2, 2021 # Hamza Assada <7amza.it@gmail.com>, 2022 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Hamza Assada <7amza.it@gmail.com>, 2022\n" -"Language-Team: Arabic (https://www.transifex.com/hisp-uio/teams/100509/ar/)\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -72,6 +72,12 @@ msgstr "عنصر نصي" msgid "Add text here" msgstr "اضف نص هنا" +msgid "Filters are not applied to line list dashboard items" +msgstr "" + +msgid "Filters not applied" +msgstr "" + msgid "There was a problem loading this dashboard item" msgstr "حدثت مشكلة أثناء تحميل عنصر لوحة المعلومات هذا" @@ -105,15 +111,30 @@ msgstr "عرض كخريطة" msgid "There was a problem loading interpretations for this item" msgstr "حدثت مشكلة أثناء تحميل التفسيرات لهذا العنصر" +msgid "The plugin for rendering this item is not available" +msgstr "" + +msgid "Install the {{appName}} app from the App Hub" +msgstr "" + +msgid "No data to display" +msgstr "لا توجد بيانات للعرض" + +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" + +msgid "Show without filters" +msgstr "" + msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "لا يمكن عرض خرائط مع طبقات Earth Engine في حالة عدم الاتصال بالإنترنت" msgid "Unable to load the plugin for this item" msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر" -msgid "No data to display" -msgstr "لا توجد بيانات للعرض" - msgid "There was an error loading data for this item" msgstr "حدث خطأ أثناء تحميل البيانات لهذا العنصر" @@ -141,6 +162,9 @@ msgstr "تقارير الحدث" msgid "Event charts" msgstr "المخطط البياني للأحداث" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "التطبيقات" @@ -210,7 +234,7 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"سيؤدي حذف لوحة المعلومات \"{{dashboardName}}\" إلى إزالتها عن جميع " +"سيؤدي حذف لوحة المعلومات \"{{ dashboardName }}\" إلى إزالتها عن جميع " "المستخدمين. لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة " "المعلومات هذه نهائياً؟" diff --git a/i18n/ar_IQ.po b/i18n/ar_IQ.po index 5f0defcd5..afefed6d5 100644 --- a/i18n/ar_IQ.po +++ b/i18n/ar_IQ.po @@ -1,14 +1,15 @@ # # Translators: # KRG HIS , 2021 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: KRG HIS , 2021\n" -"Language-Team: Arabic (Iraq) (https://www.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -70,6 +71,12 @@ msgstr "عنصر نصي" msgid "Add text here" msgstr "اضف نص هنا" +msgid "Filters are not applied to line list dashboard items" +msgstr "" + +msgid "Filters not applied" +msgstr "" + msgid "There was a problem loading this dashboard item" msgstr "حدثت مشكلة أثناء تحميل عنصر لوحة المعلومات هذا" @@ -103,15 +110,30 @@ msgstr "عرض كخريطة" msgid "There was a problem loading interpretations for this item" msgstr "" -msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgid "The plugin for rendering this item is not available" msgstr "" -msgid "Unable to load the plugin for this item" -msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر" +msgid "Install the {{appName}} app from the App Hub" +msgstr "" msgid "No data to display" msgstr "لا توجد بيانات للعرض" +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" + +msgid "Show without filters" +msgstr "" + +msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgstr "" + +msgid "Unable to load the plugin for this item" +msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر" + msgid "There was an error loading data for this item" msgstr "" @@ -139,6 +161,9 @@ msgstr "تقارير الحدث" msgid "Event charts" msgstr "المخطط البياني للأحداث" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "التطبيقات" @@ -204,9 +229,9 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"سيؤدي حذف لوحة المعلومات \"{{dashboardName}}\" إلى إزالتها لجميع المستخدمين." -" لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة المعلومات هذه " -"نهائياً؟" +"سيؤدي حذف لوحة المعلومات \"{{ dashboardName }}\" إلى إزالتها لجميع " +"المستخدمين. لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة " +"المعلومات هذه نهائياً؟" msgid "Cancel" msgstr "إلغاء" diff --git a/i18n/es.po b/i18n/es.po index 34982d30b..6d3dc07ec 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -5,18 +5,18 @@ # Gabriela Rodriguez , 2021 # Alison Andrade , 2021 # Prabhjot Singh, 2021 -# Philip Larsen Donnelly, 2021 # Viktor Varland , 2021 # Marta Vila , 2023 # Enzo Nicolas Rossi , 2023 # Janeth Cruz, 2023 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Janeth Cruz, 2023\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -399,9 +399,9 @@ msgstr "Diseño" msgid "{{count}} columns" msgid_plural "{{count}} columns" -msgstr[0] "{{contar}} columna" -msgstr[1] "{{contar}} columnas" -msgstr[2] "{{contar}} columnas" +msgstr[0] "{{count}} columna" +msgstr[1] "{{count}} columnas" +msgstr[2] "{{count}} columnas" msgid "Change layout" msgstr "Cambiar diseño" @@ -571,7 +571,7 @@ msgid "Cannot star this dashboard while offline" msgstr "No se puede marcar este tablero sin conexión a internet" msgid "Loading dashboard – {{name}}" -msgstr "Cargando panel – {{nombre}}" +msgstr "Cargando panel – {{name}}" msgid "Loading dashboard" msgstr "Cargando tablero de mando" diff --git a/i18n/es_419.po b/i18n/es_419.po index 3f3371eec..b1de3958c 100644 --- a/i18n/es_419.po +++ b/i18n/es_419.po @@ -1,14 +1,14 @@ # # Translators: # Jaime Bosque , 2022 -# Enzo Nicolas Rossi , 2023 +# Enzo Nicolas Rossi , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Enzo Nicolas Rossi , 2023\n" +"Last-Translator: Enzo Nicolas Rossi , 2024\n" "Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +41,7 @@ msgid "This item has been shortened to fit on one page" msgstr "" msgid "Remove" -msgstr "" +msgstr "Eliminar" msgid "Messages" msgstr "" @@ -245,7 +245,7 @@ msgid "No, stay here" msgstr "No, quedarme aquí." msgid "Yes, discard changes" -msgstr "" +msgstr "Sí, descartar cambios" msgid "No access" msgstr "" diff --git a/i18n/fr.po b/i18n/fr.po index 3f52322eb..e150e9387 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -4,19 +4,19 @@ # Matthieu Pinard , 2019 # Yayra Gomado , 2021 # Karoline Tufte Lien , 2021 -# phil_dhis2, 2021 # Viktor Varland , 2021 # Gabriela Rodriguez , 2021 # Alice Aké , 2021 # Edem Kossi , 2022 -# Yao Selom SAKA (HISP WCA) , 2023 +# Yao Selom SAKA (HISP WCA) , 2022 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Yao Selom SAKA (HISP WCA) , 2023\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +154,7 @@ msgstr "" "Une erreur s'est produite lors du chargement des données pour cet élément" msgid "Open this item in {{appName}}" -msgstr "Ouvrez cet élément dans {{NomApp}}" +msgstr "Ouvrez cet élément dans {{appName}}" msgid "Not available offline" msgstr "Non disponible hors ligne" @@ -401,9 +401,9 @@ msgstr "Mise en page" msgid "{{count}} columns" msgid_plural "{{count}} columns" -msgstr[0] "s" +msgstr[0] "{{count}} colonne" msgstr[1] "{{count}} colonne" -msgstr[2] "{{nombre}} colonnes" +msgstr[2] "{{count}} colonnes" msgid "Change layout" msgstr "Modifier la disposition" @@ -479,9 +479,9 @@ msgstr "Tableau de bord demandé introuvable" msgid "{{count}} selected" msgid_plural "{{count}} selected" -msgstr[0] "{{nombre}} choisi" -msgstr[1] "{{nombre}} choisi" -msgstr[2] "{{nombre}} choisi" +msgstr[0] "{{count}} choisi" +msgstr[1] "{{count}} choisi" +msgstr[2] "{{count}} choisi" msgid "Cannot remove filters while offline" msgstr "Impossible de supprimer les filtres en mode hors ligne" @@ -571,7 +571,7 @@ msgid "Add filter" msgstr "Ajouter le filtre" msgid "Offline data last updated {{time}}" -msgstr "Dernière mise à jour des données hors ligne {{temps}}" +msgstr "Dernière mise à jour des données hors ligne {{time}}" msgid "Cannot unstar this dashboard while offline" msgstr "" @@ -581,7 +581,7 @@ msgid "Cannot star this dashboard while offline" msgstr "Impossible de marquer ce tableau de bord en mode hors ligne" msgid "Loading dashboard – {{name}}" -msgstr "Chargement du tableau de bord - {{nom}}" +msgstr "Chargement du tableau de bord - {{name}}" msgid "Loading dashboard" msgstr "Chargement du tableau de bord" diff --git a/i18n/nb.po b/i18n/nb.po index bfc92ac6e..a3504e7e8 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -3,13 +3,14 @@ # Caroline Hesthagen Holen , 2021 # Jan Henrik Øverland, 2022 # Karoline Tufte Lien , 2023 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Karoline Tufte Lien , 2023\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -234,7 +235,7 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"Hvis du sletter dashbordet \"{{dashboardName}}\", fjernes det for alle " +"Hvis du sletter dashbordet \"{{ dashboardName }}\", fjernes det for alle " "brukere. Denne handlingen kan ikke angres. Er du sikker på at du vil slette " "dette dashbordet permanent?" diff --git a/i18n/pt.po b/i18n/pt.po index d2199dcb3..50c5af275 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -2,19 +2,19 @@ # Translators: # Viktor Varland , 2020 # Gabriela Rodriguez , 2021 -# phil_dhis2, 2021 # Sheila André , 2021 # Ge Joao , 2021 # Fernando Jorge Bade, 2021 # David Júnior , 2022 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: David Júnior , 2022\n" -"Language-Team: Portuguese (https://www.transifex.com/hisp-uio/teams/100509/pt/)\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -78,6 +78,12 @@ msgstr "Item de texto" msgid "Add text here" msgstr "Adicione texto aqui" +msgid "Filters are not applied to line list dashboard items" +msgstr "" + +msgid "Filters not applied" +msgstr "" + msgid "There was a problem loading this dashboard item" msgstr "Ocorreu um problema ao carregar este item do painel" @@ -111,15 +117,30 @@ msgstr "Ver como mapa" msgid "There was a problem loading interpretations for this item" msgstr "Ocorreu um problema ao carregar as interpretações para este item" +msgid "The plugin for rendering this item is not available" +msgstr "" + +msgid "Install the {{appName}} app from the App Hub" +msgstr "" + +msgid "No data to display" +msgstr "Nenhum dado para exibir" + +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" + +msgid "Show without filters" +msgstr "" + msgid "Maps with Earth Engine layers cannot be displayed when offline" msgstr "Mapas com camadas do Earth Engine não podem ser exibidos off-line" msgid "Unable to load the plugin for this item" msgstr "Não foi possível carregar o plug-in para este item" -msgid "No data to display" -msgstr "Nenhum dado para exibir" - msgid "There was an error loading data for this item" msgstr "Ocorreu um erro ao carregar os dados deste item" @@ -147,6 +168,9 @@ msgstr "Relatórios de eventos" msgid "Event charts" msgstr "Gráficos de eventos" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "Aplicações" @@ -537,7 +561,7 @@ msgstr "" "Não é possível marcar este painel com estrela enquanto estiver off-line" msgid "Loading dashboard – {{name}}" -msgstr "Carregando painel– {{nome}}" +msgstr "Carregando painel– {{name}}" msgid "Loading dashboard" msgstr "A carregar painel" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po index 346240be7..aab2e782c 100644 --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -1,15 +1,16 @@ # # Translators: # Viktor Varland , 2019 -# phil_dhis2, 2021 +# Philip Larsen Donnelly, 2021 +# Thiago Rocha, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: phil_dhis2, 2021\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/hisp-uio/teams/100509/pt_BR/)\n" +"Last-Translator: Thiago Rocha, 2024\n" +"Language-Team: Portuguese (Brazil) (https://app.transifex.com/hisp-uio/teams/100509/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -71,6 +72,12 @@ msgstr "" msgid "Add text here" msgstr "" +msgid "Filters are not applied to line list dashboard items" +msgstr "" + +msgid "Filters not applied" +msgstr "" + msgid "There was a problem loading this dashboard item" msgstr "" @@ -104,15 +111,30 @@ msgstr "" msgid "There was a problem loading interpretations for this item" msgstr "" -msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgid "The plugin for rendering this item is not available" msgstr "" -msgid "Unable to load the plugin for this item" +msgid "Install the {{appName}} app from the App Hub" msgstr "" msgid "No data to display" msgstr "" +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" + +msgid "Show without filters" +msgstr "" + +msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgstr "" + +msgid "Unable to load the plugin for this item" +msgstr "" + msgid "There was an error loading data for this item" msgstr "" @@ -140,9 +162,12 @@ msgstr "" msgid "Event charts" msgstr "" -msgid "Apps" +msgid "Line lists" msgstr "" +msgid "Apps" +msgstr "Aplicações" + msgid "Reports" msgstr "Relatórios" @@ -171,7 +196,7 @@ msgid "Cannot save this dashboard while offline" msgstr "" msgid "Save changes" -msgstr "" +msgstr "Salvar alterações" msgid "Exit print preview" msgstr "" @@ -224,7 +249,7 @@ msgid "Yes, discard changes" msgstr "" msgid "No access" -msgstr "" +msgstr "Sem acesso" msgid "Not supported" msgstr "" @@ -420,7 +445,7 @@ msgid "" msgstr "" msgid "No, cancel" -msgstr "" +msgstr "Não, cancelar" msgid "Yes, remove filters" msgstr "" @@ -462,7 +487,7 @@ msgid "Close dashboard" msgstr "" msgid "More" -msgstr "" +msgstr "Mais" msgid "Edit" msgstr "Editar" diff --git a/i18n/uk.po b/i18n/uk.po index c8145c07c..2309d1821 100644 --- a/i18n/uk.po +++ b/i18n/uk.po @@ -1,17 +1,17 @@ # # Translators: # Viktor Varland , 2020 -# Philip Larsen Donnelly, 2021 # Wanda , 2021 # Éva Tamási, 2022 # Nadiia , 2023 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Nadiia , 2023\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Ukrainian (https://app.transifex.com/hisp-uio/teams/100509/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -248,7 +248,7 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"Після видалення інформаційної панелі \"{ { dashboardName}}\" її буде " +"Після видалення інформаційної панелі \"{{ dashboardName }}\" її буде " "видалено для всіх користувачів. Цю дію неможливо скасувати. Ви дійсно хочете" " остаточно видалити цю інформаційну панель?" diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index 5596e92c3..2f0305790 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -1,13 +1,14 @@ # # Translators: # Ibatov , 2023 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Ibatov , 2023\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgid "Show details and interpretations" msgstr "Деталлар ва тавсифларни кўрсатиш" msgid "Open in {{appName}} app" -msgstr "Иловада {{ИловаНоми}} да очиш" +msgstr "Иловада {{appName}} да очиш" msgid "View fullscreen" msgstr "Экранни тўлдириб кўрсатиш" @@ -236,8 +237,8 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"Панелни ўчириб ташлаш {{БошқарувПанелиНоми}}, уни барча фойдаланувчилар учун" -" ўчирилишига олиб келади. Бу ҳаракатни орқага қайтариб бўлмайди. Ҳақиқатдан " +"Панелни ўчириб ташлаш {{ dashboardName }}, уни барча фойдаланувчилар учун " +"ўчирилишига олиб келади. Бу ҳаракатни орқага қайтариб бўлмайди. Ҳақиқатдан " "ҳам ушбу панелни орқага қайтариб бўлмаслик шарти билан ўчириб " "ташламоқчимисиз?" @@ -459,7 +460,7 @@ msgstr "Сўралган бошқарув панели топилмади" msgid "{{count}} selected" msgid_plural "{{count}} selected" -msgstr[0] "{{жами}} танланган" +msgstr[0] "{{count}} танланган" msgid "Cannot remove filters while offline" msgstr "Офллайн режимда фильтрни ўчириб бўлмайди" @@ -555,7 +556,7 @@ msgid "Cannot star this dashboard while offline" msgstr "Оффлайн режимда бошқарув панелида белгилар қўйиб бўлмайди" msgid "Loading dashboard – {{name}}" -msgstr "Бошқарув панели юкланмоқда - {{исми}}" +msgstr "Бошқарув панели юкланмоқда - {{name}}" msgid "Loading dashboard" msgstr "Бошқарув панели юкланмоқда" diff --git a/i18n/uz_UZ_Latn.po b/i18n/uz_UZ_Latn.po index 5c9902681..438248b11 100644 --- a/i18n/uz_UZ_Latn.po +++ b/i18n/uz_UZ_Latn.po @@ -1,13 +1,14 @@ # # Translators: # Yury Rogachev , 2021 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" "POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Yury Rogachev , 2021\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" "Language-Team: Uzbek (Latin) (https://app.transifex.com/hisp-uio/teams/100509/uz@Latn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -526,7 +527,7 @@ msgid "Cannot star this dashboard while offline" msgstr "" msgid "Loading dashboard – {{name}}" -msgstr "Boshqaruv paneli yuklanmoqda - {{ismi}}" +msgstr "Boshqaruv paneli yuklanmoqda - {{name}}" msgid "Loading dashboard" msgstr "" diff --git a/i18n/vi.po b/i18n/vi.po index 0908f6f17..e5d3871fe 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -1,17 +1,17 @@ # # Translators: -# phil_dhis2, 2021 # Viktor Varland , 2021 # Mai Nguyen , 2021 # Thuy Nguyen , 2022 +# Philip Larsen Donnelly, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n" +"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" "PO-Revision-Date: 2019-06-25 12:37+0000\n" -"Last-Translator: Thuy Nguyen , 2022\n" -"Language-Team: Vietnamese (https://www.transifex.com/hisp-uio/teams/100509/vi/)\n" +"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Language-Team: Vietnamese (https://app.transifex.com/hisp-uio/teams/100509/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -75,6 +75,12 @@ msgstr "Mục văn bản" msgid "Add text here" msgstr "Thêm văn bản tại đây" +msgid "Filters are not applied to line list dashboard items" +msgstr "" + +msgid "Filters not applied" +msgstr "" + msgid "There was a problem loading this dashboard item" msgstr "Đã xảy ra sự cố khi tải mục bảng điều khiển này" @@ -85,7 +91,7 @@ msgid "Show details and interpretations" msgstr "" msgid "Open in {{appName}} app" -msgstr "Mở trong ứng dụng {{Tên ứng dụng}}" +msgstr "Mở trong ứng dụng {{appName}}" msgid "View fullscreen" msgstr "Xem toàn màn hình" @@ -108,15 +114,30 @@ msgstr "Xem dưới dạng bản đồ" msgid "There was a problem loading interpretations for this item" msgstr "" -msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgid "The plugin for rendering this item is not available" msgstr "" -msgid "Unable to load the plugin for this item" -msgstr "Không thể tải plugin cho mục này" +msgid "Install the {{appName}} app from the App Hub" +msgstr "" msgid "No data to display" msgstr "Không có dữ liệu hiển thị" +msgid "" +"Install Line Listing app version ${minLLVersion.join(\n" +" '.'\n" +" )} or higher in order to display this item." +msgstr "" + +msgid "Show without filters" +msgstr "" + +msgid "Maps with Earth Engine layers cannot be displayed when offline" +msgstr "" + +msgid "Unable to load the plugin for this item" +msgstr "Không thể tải plugin cho mục này" + msgid "There was an error loading data for this item" msgstr "" @@ -144,6 +165,9 @@ msgstr "Báo Cáo Sự Kiện" msgid "Event charts" msgstr "Biểu Đồ Sự Kiện" +msgid "Line lists" +msgstr "" + msgid "Apps" msgstr "Ứng dụng" @@ -209,9 +233,9 @@ msgid "" "This action cannot be undone. Are you sure you want to permanently delete " "this dashboard?" msgstr "" -"Xóa bảng điều khiển \"{{tên bảng điều khiển}}\" sẽ xóa cho tất cả người " -"dùng. Hành động này không thể được hoàn tác. Bạn có chắc chắn muốn xóa vĩnh " -"viễn bảng điều khiển này không?" +"Xóa bảng điều khiển \"{{ dashboardName }}\" sẽ xóa cho tất cả người dùng. " +"Hành động này không thể được hoàn tác. Bạn có chắc chắn muốn xóa vĩnh viễn " +"bảng điều khiển này không?" msgid "Cancel" msgstr "Hủy" @@ -410,7 +434,7 @@ msgstr "Không tìm thấy bảng điều khiển được yêu cầu" msgid "{{count}} selected" msgid_plural "{{count}} selected" -msgstr[0] "Đã chọn {{đếm}}" +msgstr[0] "Đã chọn {{count}}" msgid "Cannot remove filters while offline" msgstr "" @@ -501,7 +525,7 @@ msgid "Cannot star this dashboard while offline" msgstr "" msgid "Loading dashboard – {{name}}" -msgstr "Đang bảng điều khiển - {{tên}}" +msgstr "Đang bảng điều khiển - {{name}}" msgid "Loading dashboard" msgstr "" From 3550cfa086f17d70fc67c9904c858c3c3bb14e79 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 4 Mar 2024 15:28:22 +0100 Subject: [PATCH 17/22] fix: use interpretations component from Analytics (DHIS2-15441) (#2430) --- .../item_context_menu/show_interpretations.js | 2 +- i18n/en.pot | 7 +- package.json | 5 +- .../InterpretationReplyForm.js | 111 +++ .../Item/VisualizationItem/ItemFooter.js | 60 +- .../styles/ItemFooter.module.css | 2 +- src/pages/view/ItemGrid.js | 4 +- yarn.lock | 639 +----------------- 8 files changed, 195 insertions(+), 635 deletions(-) create mode 100644 src/components/Item/VisualizationItem/InterpretationReplyForm.js diff --git a/cypress/integration/view/item_context_menu/show_interpretations.js b/cypress/integration/view/item_context_menu/show_interpretations.js index 680520080..7c01e4a49 100644 --- a/cypress/integration/view/item_context_menu/show_interpretations.js +++ b/cypress/integration/view/item_context_menu/show_interpretations.js @@ -23,7 +23,7 @@ When( Then('the interpretations panel is displayed', () => { getDashboardItem(chartItemUid) .find(itemDetailsSel) - .contains('Visualization details') + .contains('About this') .scrollIntoView() .should('be.visible') diff --git a/i18n/en.pot b/i18n/en.pot index 0597b5a70..a9f4adf5c 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n" -"PO-Revision-Date: 2023-05-03T11:08:21.315Z\n" +"POT-Creation-Date: 2023-06-22T08:57:46.931Z\n" +"PO-Revision-Date: 2023-06-22T08:57:46.931Z\n" msgid "Untitled dashboard" msgstr "Untitled dashboard" @@ -62,6 +62,9 @@ msgstr "Text item" msgid "Add text here" msgstr "Add text here" +msgid "Back to all interpretations" +msgstr "Back to all interpretations" + msgid "Filters are not applied to line list dashboard items" msgstr "Filters are not applied to line list dashboard items" diff --git a/package.json b/package.json index 1258ca5a2..c7e7fdc83 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,10 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^26.2.0", + "@dhis2/analytics": "^26.4.0", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", - "@dhis2/d2-ui-core": "^7.4.3", - "@dhis2/d2-ui-interpretations": "^7.4.3", - "@dhis2/d2-ui-mentions-wrapper": "^7.4.3", "@dhis2/d2-ui-rich-text": "^7.4.3", "@dhis2/ui": "^8.14.0", "@krakenjs/post-robot": "^11.0.0", diff --git a/src/components/Item/VisualizationItem/InterpretationReplyForm.js b/src/components/Item/VisualizationItem/InterpretationReplyForm.js new file mode 100644 index 000000000..c979e54c5 --- /dev/null +++ b/src/components/Item/VisualizationItem/InterpretationReplyForm.js @@ -0,0 +1,111 @@ +import { InterpretationThread } from '@dhis2/analytics' +import { useDataQuery } from '@dhis2/app-runtime' +import i18n from '@dhis2/d2-i18n' +import { + Layer, + CenteredContent, + CircularLoader, + Button, + IconChevronLeft16, + spacers, +} from '@dhis2/ui' +import PropTypes from 'prop-types' +import React, { useEffect } from 'react' + +const query = { + interpretation: { + resource: 'interpretations', + id: ({ id }) => id, + params: { + fields: [ + 'access', + 'id', + 'text', + 'created', + 'createdBy[id, displayName]', + 'user[id,displayName]', + 'likes', + 'likedBy', + 'comments[access,id,text,created,createdBy[id,displayName]]', + ], + }, + }, +} + +export const InterpretationReplyForm = ({ + currentUser, + interpretationId, + onGoBackClicked, + onInterpretationDeleted, + dashboardRedirectUrl, + initialFocus, +}) => { + const { data, refetch, loading, fetching } = useDataQuery(query, { + lazy: true, + }) + const interpretation = data?.interpretation + + useEffect(() => { + if (interpretationId) { + refetch({ id: interpretationId }) + } + }, [interpretationId, refetch]) + + const onThreadUpdated = () => refetch({ id: interpretationId }) + + if (loading || !interpretation) { + return ( + + + + + + ) + } + + return ( +
+
+ +
+ +
+ ) +} + +InterpretationReplyForm.displayName = 'InterpretationReplyForm' + +InterpretationReplyForm.defaultProps = { + onInterpretationDeleted: Function.prototype, +} + +InterpretationReplyForm.propTypes = { + currentUser: PropTypes.object.isRequired, + interpretationId: PropTypes.string.isRequired, + onGoBackClicked: PropTypes.func.isRequired, + dashboardRedirectUrl: PropTypes.string, + initialFocus: PropTypes.bool, + onInterpretationDeleted: PropTypes.func, +} diff --git a/src/components/Item/VisualizationItem/ItemFooter.js b/src/components/Item/VisualizationItem/ItemFooter.js index fdf50f6d8..7898b0119 100644 --- a/src/components/Item/VisualizationItem/ItemFooter.js +++ b/src/components/Item/VisualizationItem/ItemFooter.js @@ -1,16 +1,37 @@ -import { useDhis2ConnectionStatus } from '@dhis2/app-runtime' +import { AboutAOUnit, InterpretationsUnit } from '@dhis2/analytics' +import { useConfig } from '@dhis2/app-runtime' import { useD2 } from '@dhis2/app-runtime-adapter-d2' import i18n from '@dhis2/d2-i18n' -import InterpretationsComponent from '@dhis2/d2-ui-interpretations' import PropTypes from 'prop-types' -import React from 'react' +import React, { useState } from 'react' import { getVisualizationId } from '../../../modules/item.js' +import { getItemUrl, itemTypeMap } from '../../../modules/itemTypes.js' import FatalErrorBoundary from './FatalErrorBoundary.js' +import { InterpretationReplyForm } from './InterpretationReplyForm.js' import classes from './styles/ItemFooter.module.css' -const ItemFooter = (props) => { +const ItemFooter = ({ item }) => { + const { baseUrl } = useConfig() + const [interpretationId, setInterpretationId] = useState(null) + const [replyInitialFocus, setReplyInitialFocus] = useState(false) const { d2 } = useD2() - const { isDisconnected: offline } = useDhis2ConnectionStatus() + + const setReplyToInterpretation = (id) => { + setInterpretationId(id) + setReplyInitialFocus(true) + } + const clearInterpretation = () => { + setInterpretationId(null) + setReplyInitialFocus(false) + } + + const setViewInterpretation = (id) => { + setInterpretationId(id) + setReplyInitialFocus(false) + } + + const id = getVisualizationId(item) + const dashboardRedirectUrl = getItemUrl(item.type, { id }, baseUrl) return (
@@ -21,14 +42,29 @@ const ItemFooter = (props) => { 'There was a problem loading interpretations for this item' )} > - + {interpretationId ? ( + + ) : ( + + )}
diff --git a/src/components/Item/VisualizationItem/styles/ItemFooter.module.css b/src/components/Item/VisualizationItem/styles/ItemFooter.module.css index 54d5866a2..ee7f6e56a 100644 --- a/src/components/Item/VisualizationItem/styles/ItemFooter.module.css +++ b/src/components/Item/VisualizationItem/styles/ItemFooter.module.css @@ -16,5 +16,5 @@ .scrollContainer { position: relative; overflow-y: auto; - height: 334px; + height: 376px; } diff --git a/src/pages/view/ItemGrid.js b/src/pages/view/ItemGrid.js index 11cbfb942..28241b1ef 100644 --- a/src/pages/view/ItemGrid.js +++ b/src/pages/view/ItemGrid.js @@ -31,8 +31,8 @@ import { } from '../../reducers/selected.js' import classes from './styles/ItemGrid.module.css' -const EXPANDED_HEIGHT = 17 -const EXPANDED_HEIGHT_SM = 13 +const EXPANDED_HEIGHT = 19 +const EXPANDED_HEIGHT_SM = 15 const ResponsiveItemGrid = ({ dashboardId, dashboardItems }) => { const { width } = useWindowDimensions() diff --git a/yarn.lock b/yarn.lock index 9f457578b..80a16667b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1278,7 +1278,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.3.tgz#0a7fce51d43adbf0f7b517a71f4c3aaca92ebcbb" integrity sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ== @@ -2245,10 +2245,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@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== +"@dhis2/analytics@^26.4.0": + version "26.4.0" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.4.0.tgz#adbdac2896457fdcaf913f66ee5afe012eab5ea5" + integrity sha512-j5t6hOykYEW6jTmcwDUP/bmXJS3+t2h92GzzOKhNnhsc3iPNjB1xVGQxfKmPhO3sCLvMR1N0mG1EP7/AEefUew== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" @@ -2480,44 +2480,7 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/d2-ui-core@7.4.3", "@dhis2/d2-ui-core@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-7.4.3.tgz#d880ad82f0ce28833db02fe64016242c3031610d" - integrity sha512-X+ZlTVB4IbAaQlKKWoXjHXCaTfw5jDxHy2KRIWRskIVPhXfiTiyqzdKN/DSi2/99HDQ6PSq9eqmCY4AeTJb3Kw== - dependencies: - babel-runtime "^6.26.0" - d2 "~31.7" - lodash "^4.17.10" - material-ui "^0.20.0" - rxjs "^5.5.7" - -"@dhis2/d2-ui-interpretations@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-7.4.3.tgz#27bbe2276bf94e26b9e7297e239f44856aedf840" - integrity sha512-JnYq0OPemjgIwLHch9GBAoL6RXrHQLTmvnVZJRYcBRyABOS41D/0hcJX/2sBUu3ZHDopNS2Td8Vu0rc4G8SCBA== - dependencies: - "@dhis2/d2-ui-mentions-wrapper" "7.4.3" - "@dhis2/d2-ui-rich-text" "7.4.3" - "@dhis2/d2-ui-sharing-dialog" "7.4.3" - "@material-ui/core" "^3.3.1" - "@material-ui/icons" "^3.0.1" - babel-runtime "^6.26.0" - classnames "^2.2.6" - husky "^1.0.0-rc.8" - postcss-rtl "^1.3.0" - prop-types "^15.5.10" - react-portal "^4.1.5" - -"@dhis2/d2-ui-mentions-wrapper@7.4.3", "@dhis2/d2-ui-mentions-wrapper@^7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-mentions-wrapper/-/d2-ui-mentions-wrapper-7.4.3.tgz#f6b469fbfe9e092478aacb3babb801e9ae1eda79" - integrity sha512-H02qUra/Y7XfszN19mAsxRi71eFYe92ctiEL5I26rA8LVQPcrz7mN08yVwJAdHUWwZtI6/UJujeEN5W/IZAKHw== - dependencies: - "@material-ui/core" "^3.3.1" - lodash "^4.17.10" - prop-types "^15.6.2" - -"@dhis2/d2-ui-rich-text@7.4.3", "@dhis2/d2-ui-rich-text@^7.4.1", "@dhis2/d2-ui-rich-text@^7.4.3": +"@dhis2/d2-ui-rich-text@^7.4.1", "@dhis2/d2-ui-rich-text@^7.4.3": version "7.4.3" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.4.3.tgz#a42c8e231bcc05186dd432dac86b33aed4ddc10d" integrity sha512-60k/6CO2I8f4t3jU1nAic7uWONME1rckM8RcLnelhwUG20EZWq45OnDDdSfHgOWTwVDtxFnG3wspInkG/530KA== @@ -2526,20 +2489,6 @@ markdown-it "^8.4.2" prop-types "^15.6.2" -"@dhis2/d2-ui-sharing-dialog@7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-sharing-dialog/-/d2-ui-sharing-dialog-7.4.3.tgz#a01a73eec5d3ed4edf657c62dbac3b7d49be0091" - integrity sha512-Ciuc5KOXPVP4rBmXmCqCBx/rOJT3tifCaS60S1wRUihsK733cAZNBJ5i/onrQfICl1n2dsK0Mzy70aTkA1v2RQ== - dependencies: - "@dhis2/d2-ui-core" "7.4.3" - "@material-ui/core" "^3.3.1" - "@material-ui/icons" "^3.0.1" - babel-runtime "^6.26.0" - downshift "^2.2.2" - prop-types "^15.5.10" - recompose "^0.26.0" - rxjs "^5.5.7" - "@dhis2/multi-calendar-dates@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.0.tgz#bf7f49aecdffa9781837a5d60d56a094b74ab4df" @@ -3145,66 +3094,6 @@ resolved "https://registry.yarnpkg.com/@ls-lint/ls-lint/-/ls-lint-1.11.0.tgz#fff074121e72bbbf6f1e5da05b916196039479df" integrity sha512-YwVzEaGDM5LvRN7fn+8hYLTgcXsyksAr3V1x76/V3mWyaqKUAo4llcCd8lYoBCo4bxVgFq2pzPDQpeunZejLQg== -"@material-ui/core@^3.3.1": - version "3.9.4" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.9.4.tgz#5297fd4ad9e739a87da4a6d34fc4af5396886e13" - integrity sha512-r8QFLSexcYZbnqy/Hn4v8xzmAJV41yaodUVjmbGLi1iGDLG3+W941hEtEiBmxTRRqv2BdK3r4ijILcqKmDv/Sw== - dependencies: - "@babel/runtime" "^7.2.0" - "@material-ui/system" "^3.0.0-alpha.0" - "@material-ui/utils" "^3.0.0-alpha.2" - "@types/jss" "^9.5.6" - "@types/react-transition-group" "^2.0.8" - brcast "^3.0.1" - classnames "^2.2.5" - csstype "^2.5.2" - debounce "^1.1.0" - deepmerge "^3.0.0" - dom-helpers "^3.2.1" - hoist-non-react-statics "^3.2.1" - is-plain-object "^2.0.4" - jss "^9.8.7" - jss-camel-case "^6.0.0" - jss-default-unit "^8.0.2" - jss-global "^3.0.0" - jss-nested "^6.0.1" - jss-props-sort "^6.0.0" - jss-vendor-prefixer "^7.0.0" - normalize-scroll-left "^0.1.2" - popper.js "^1.14.1" - prop-types "^15.6.0" - react-event-listener "^0.6.2" - react-transition-group "^2.2.1" - recompose "0.28.0 - 0.30.0" - warning "^4.0.1" - -"@material-ui/icons@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-3.0.2.tgz#d67a6dd1ec8312d3a88ec97944a63daeef24fe10" - integrity sha512-QY/3gJnObZQ3O/e6WjH+0ah2M3MOgLOzCy8HTUoUx9B6dDrS18vP7Ycw3qrDEKlB6q1KNxy6CZHm5FCauWGy2g== - dependencies: - "@babel/runtime" "^7.2.0" - recompose "0.28.0 - 0.30.0" - -"@material-ui/system@^3.0.0-alpha.0": - version "3.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-3.0.0-alpha.2.tgz#096e80c8bb0f70aea435b9e38ea7749ee77b4e46" - integrity sha512-odmxQ0peKpP7RQBQ8koly06YhsPzcoVib1vByVPBH4QhwqBXuYoqlCjt02846fYspAqkrWzjxnWUD311EBbxOA== - dependencies: - "@babel/runtime" "^7.2.0" - deepmerge "^3.0.0" - prop-types "^15.6.0" - warning "^4.0.1" - -"@material-ui/utils@^3.0.0-alpha.2": - version "3.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz#836c62ea46f5ffc6f0b5ea05ab814704a86908b1" - integrity sha512-rwMdMZptX0DivkqBuC+Jdq7BYTXwqKai5G5ejPpuEDKpWzi1Oxp+LygGw329FrKpuKeiqpcymlqJTjmy+quWng== - dependencies: - "@babel/runtime" "^7.2.0" - prop-types "^15.6.0" - react-is "^16.6.3" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -3694,14 +3583,6 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/jss@^9.5.6": - version "9.5.8" - resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.8.tgz#258391f42211c042fc965508d505cbdc579baa5b" - integrity sha512-bBbHvjhm42UKki+wZpR89j73ykSXg99/bhuKuYYePtpma3ZAnmeGnl0WxXiZhPGsIfzKwCUkpPC0jlrVMBfRxA== - dependencies: - csstype "^2.0.0" - indefinite-observable "^1.0.1" - "@types/mime@*": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" @@ -3774,13 +3655,6 @@ hoist-non-react-statics "^3.3.0" redux "^4.0.0" -"@types/react-transition-group@^2.0.8": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.9.2.tgz#c48cf2a11977c8b4ff539a1c91d259eaa627028d" - integrity sha512-5Fv2DQNO+GpdPZcxp2x/OQG/H19A01WlmpjVD9cKvVFmoVLOZ9LvBgSWG6pSXIU4og5fgbvGPaCV5+VGkWAEHA== - dependencies: - "@types/react" "*" - "@types/react@*", "@types/react@^17": version "17.0.60" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.60.tgz#a4a97dcdbebad76612c188fc06440e4995fd8ad2" @@ -4573,7 +4447,7 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= -asap@~2.0.3, asap@~2.0.6: +asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -4902,7 +4776,7 @@ babel-preset-react-app@^10.0.1: babel-plugin-macros "^3.1.0" babel-plugin-transform-react-remove-prop-types "^0.4.24" -babel-runtime@^6.11.6, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-runtime@^6.11.6, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -5073,11 +4947,6 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bowser@^1.7.3: - version "1.9.4" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.4.tgz#890c58a2813a9d3243704334fa81b96a5c150c9a" - integrity sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ== - boxen@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb" @@ -5123,11 +4992,6 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brcast@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.2.tgz#55c41a7a077ff4e7ac784c2060e544d4c39ad477" - integrity sha512-f5XwwFCCuvgqP2nMH/hJ74FqnGmb4X3D+NC//HphxJzzhsZvSZa+Hk/syB7j3ZHpPDLMoYU8oBgviRWfNvEfKA== - broadcast-channel@^3.4.1: version "3.7.0" resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937" @@ -5476,25 +5340,6 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -5569,11 +5414,6 @@ chai@^4.1.2: pathval "^1.1.1" type-detect "^4.0.5" -chain-function@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc" - integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg== - chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -5610,11 +5450,6 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -change-emitter@^0.1.2: - version "0.1.6" - resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" - integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU= - char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -5722,7 +5557,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@2.x, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2: +classnames@2.x, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== @@ -5942,11 +5777,6 @@ colors@^1.0.3, colors@^1.1.2: resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -colors@~0.6.0-1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" - integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - combine-source-map@^0.8.0, combine-source-map@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" @@ -5989,11 +5819,6 @@ commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== -commander@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" - integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -6057,11 +5882,6 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" -compute-scroll-into-view@^1.0.2: - version "1.0.17" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab" - integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -6213,11 +6033,6 @@ core-js-pure@^3.23.3, core-js-pure@^3.30.2: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.2.tgz#005a82551f4af3250dcfb46ed360fad32ced114e" integrity sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg== -core-js@^1.0.0: - version "1.2.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" - integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= - core-js@^2.4.0, core-js@^2.6.12: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -6248,16 +6063,6 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" -cosmiconfig@^5.0.7: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -6349,17 +6154,6 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -6427,14 +6221,6 @@ css-has-pseudo@^3.0.4: dependencies: postcss-selector-parser "^6.0.9" -css-in-js-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99" - integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA== - dependencies: - hyphenate-style-name "^1.0.2" - isobject "^3.0.1" - css-loader@^6.5.1, css-loader@^6.7.1: version "6.7.3" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" @@ -6508,13 +6294,6 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-vendor@^0.3.8: - version "0.3.8" - resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-0.3.8.tgz#6421cfd3034ce664fe7673972fd0119fc28941fa" - integrity sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo= - dependencies: - is-in-browser "^1.0.2" - css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -6613,11 +6392,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.0.0, csstype@^2.5.2: - version "2.6.17" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e" - integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A== - csstype@^3.0.2: version "3.1.2" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" @@ -6773,13 +6547,6 @@ d2@^31.10.0: dependencies: isomorphic-fetch "^2.2.1" -d2@~31.7: - version "31.7.0" - resolved "https://registry.yarnpkg.com/d2/-/d2-31.7.0.tgz#3a843240fecaafdf213da78b55aed9b8611ee22e" - integrity sha512-+ubKyPWKxUz90g5RHCYIt4KxKPzcCOBvDS7X0076XSycecfx4qvtkGBcKyFmXdz27iwTLUpNtruL9pUK9aTi/A== - dependencies: - isomorphic-fetch "^2.2.1" - d3-color@^1.2.3: version "1.4.1" resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" @@ -6839,11 +6606,6 @@ dayjs@^1.9.3: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== -debounce@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" - integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -6960,11 +6722,6 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -deepmerge@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7" - integrity sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA== - deepmerge@^4.0.0, deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" @@ -7169,13 +6926,6 @@ dom-converter@^0.2.0: dependencies: utila "~0.4" -dom-helpers@^3.2.0, dom-helpers@^3.2.1, dom-helpers@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8" - integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA== - dependencies: - "@babel/runtime" "^7.1.2" - dom-serializer@0: version "0.2.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" @@ -7276,14 +7026,6 @@ dotenv@^8.1.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== -downshift@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/downshift/-/downshift-2.2.3.tgz#85187568455134e72025fbddd40bb9cf96c55eed" - integrity sha512-SXFgGq5QYT9mxbaSsYdp4Ng0tP87F5z33PD+tZ2kyK0qIBYd1rcPe90+ykCOYqsWHsb/gcrjaAav2Jpa6qNbQg== - dependencies: - compute-scroll-into-view "^1.0.2" - prop-types "^15.6.0" - duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -8014,19 +7756,6 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" @@ -8256,19 +7985,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fbjs@^0.8.1: - version "0.8.17" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" - integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -8415,14 +8131,6 @@ find-yarn-workspace-root@^2.0.0: dependencies: micromatch "^4.0.2" -findup@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/findup/-/findup-0.1.5.tgz#8ad929a3393bac627957a7e5de4623b06b0e2ceb" - integrity sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= - dependencies: - colors "~0.6.0-1" - commander "~2.1.0" - flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -8682,17 +8390,12 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= -get-stream@^4.0.0, get-stream@^4.1.0: +get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== @@ -9113,12 +8816,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^2.3.1: - version "2.5.5" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== - -hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -9305,32 +9003,11 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^1.0.0-rc.8: - version "1.3.1" - resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0" - integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg== - dependencies: - cosmiconfig "^5.0.7" - execa "^1.0.0" - find-up "^3.0.0" - get-stdin "^6.0.0" - is-ci "^2.0.0" - pkg-dir "^3.0.0" - please-upgrade-node "^3.1.1" - read-pkg "^4.0.1" - run-node "^1.0.0" - slash "^2.0.0" - husky@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== -hyphenate-style-name@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" - integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== - i18next-conv@^9: version "9.2.1" resolved "https://registry.yarnpkg.com/i18next-conv/-/i18next-conv-9.2.1.tgz#1f876a31b88a12d1fd830485a6926b8a1c88feb5" @@ -9442,14 +9119,6 @@ immutability-helper@^3.1.1: resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz#2b86b2286ed3b1241c9e23b7b21e0444f52f77b7" integrity sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ== -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -9476,13 +9145,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indefinite-observable@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-1.0.2.tgz#0a328793ab2385d4b9dca23eaab4afe6936a73f8" - integrity sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA== - dependencies: - symbol-observable "1.2.0" - indent-string@^3.0.0, indent-string@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" @@ -9533,14 +9195,6 @@ inline-source-map@~0.6.0: dependencies: source-map "~0.5.3" -inline-style-prefixer@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz#8551b8e5b4d573244e66a34b04f7d32076a2b534" - integrity sha1-hVG45bTVcyROZqNLBPfTIHaitTQ= - dependencies: - bowser "^1.7.3" - css-in-js-utils "^2.0.0" - inquirer@^7.0.4, inquirer@^7.3.3: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" @@ -9806,11 +9460,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-in-browser@^1.0.2, is-in-browser@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= - is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" @@ -10102,7 +9751,7 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1: +isomorphic-fetch@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= @@ -10872,51 +10521,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jss-camel-case@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.1.0.tgz#ccb1ff8d6c701c02a1fed6fb6fb6b7896e11ce44" - integrity sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ== - dependencies: - hyphenate-style-name "^1.0.2" - -jss-default-unit@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6" - integrity sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg== - -jss-global@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2" - integrity sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q== - -jss-nested@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca" - integrity sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA== - dependencies: - warning "^3.0.0" - -jss-props-sort@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" - integrity sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g== - -jss-vendor-prefixer@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71" - integrity sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA== - dependencies: - css-vendor "^0.3.8" - -jss@^9.8.7: - version "9.8.7" - resolved "https://registry.yarnpkg.com/jss/-/jss-9.8.7.tgz#ed9763fc0f2f0260fc8260dac657af61e622ce05" - integrity sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ== - dependencies: - is-in-browser "^1.1.3" - symbol-observable "^1.1.0" - warning "^3.0.0" - "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" @@ -10925,11 +10529,6 @@ jss@^9.8.7: array-includes "^3.1.5" object.assign "^4.1.3" -keycode@^2.1.8: - version "2.2.0" - resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" - integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ= - keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -11248,7 +10847,7 @@ lodash.memoize@~3.0.3: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= -lodash.merge@^4.6.0, lodash.merge@^4.6.2: +lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== @@ -11263,11 +10862,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.throttle@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -11283,7 +10877,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.10: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11443,23 +11037,6 @@ match-sorter@^6.0.2: "@babel/runtime" "^7.12.5" remove-accents "0.4.2" -material-ui@^0.20.0: - version "0.20.2" - resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.20.2.tgz#5fc9b4b62b691d3b16c89d8e54597a0412b52c7d" - integrity sha512-VeqgQkdvtK193w+FFvXDEwlVxI4rWk83eWbpYLeOIHDPWr3rbB9B075JRnJt/8IsI2X8q5Aia5W3+7m4KkleDg== - dependencies: - babel-runtime "^6.23.0" - inline-style-prefixer "^3.0.8" - keycode "^2.1.8" - lodash.merge "^4.6.0" - lodash.throttle "^4.1.1" - prop-types "^15.5.7" - react-event-listener "^0.6.2" - react-transition-group "^1.2.1" - recompose "^0.26.0" - simple-assign "^0.1.0" - warning "^3.0.0" - mathjs@^9.4.2: version "9.5.2" resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-9.5.2.tgz#e0f3279320dc6f49e45d99c4fcdd8b52231f0462" @@ -11835,11 +11412,6 @@ next-tick@~1.0.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - no-case@^2.2.0: version "2.3.2" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" @@ -11937,11 +11509,6 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -normalize-scroll-left@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.1.2.tgz#6b79691ba79eb5fb107fa5edfbdc06b55caee2aa" - integrity sha512-F9YMRls0zCF6BFIE2YnXDRpHPpfd91nOIaNdDgrx5YMoPLo8Wqj+6jNXHQsYBavJeXP4ww8HCt0xQAKc5qk2Fg== - normalize-url@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" @@ -12451,7 +12018,7 @@ path-is-inside@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^2.0.0, path-key@^2.0.1: +path-key@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= @@ -12575,18 +12142,6 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -please-upgrade-node@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - -popper.js@^1.14.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -13112,13 +12667,6 @@ postcss-replace-overflow-wrap@^4.0.0: resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319" integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw== -postcss-rtl@^1.3.0: - version "1.7.3" - resolved "https://registry.yarnpkg.com/postcss-rtl/-/postcss-rtl-1.7.3.tgz#5019bf2826e90972fba8ad061c7f80d43c817bfb" - integrity sha512-PMwlrQSeZKChNJQGtWz9Xfk3rY1W7P5Jp4sFRXVufczQIH6vRhTNSc5gnEwKHaWrU8SMoZMi2VY7ihOmwVvW7g== - dependencies: - rtlcss "2.5.0" - postcss-selector-not@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d" @@ -13154,15 +12702,6 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^6.0.23: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - postcss@^7.0.35: version "7.0.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" @@ -13252,13 +12791,6 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - promise@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" @@ -13274,7 +12806,7 @@ prompts@^2.0.1, prompts@^2.4.2: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@15.x, prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@15.x, prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -13531,15 +13063,6 @@ react-error-overlay@^6.0.11: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== -react-event-listener@^0.6.2: - version "0.6.6" - resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz#758f7b991cad9086dd39fd29fad72127e1d8962a" - integrity sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw== - dependencies: - "@babel/runtime" "^7.2.0" - prop-types "^15.6.0" - warning "^4.0.1" - react-fast-compare@^3.0.1: version "3.2.2" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49" @@ -13563,7 +13086,7 @@ react-grid-layout@1.2.2: react-draggable "^4.0.0" react-resizable "^1.10.0" -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -13578,7 +13101,7 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== @@ -13591,13 +13114,6 @@ react-popper@^2.2.5: react-fast-compare "^3.0.1" warning "^4.0.2" -react-portal@^4.1.5: - version "4.2.1" - resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.2.1.tgz#12c1599238c06fb08a9800f3070bea2a3f78b1a6" - integrity sha512-fE9kOBagwmTXZ3YGRYb4gcMy+kSA+yLO0xnPankjRlfBv4uCpFXqKPfkpsGQQR15wkZ9EssnvTOl1yMzbkxhPQ== - dependencies: - prop-types "^15.5.8" - react-query@^3.13.11: version "3.39.2" resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.39.2.tgz#9224140f0296f01e9664b78ed6e4f69a0cc9216f" @@ -13729,27 +13245,6 @@ react-scripts@^5.0.1: optionalDependencies: fsevents "^2.3.2" -react-transition-group@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" - integrity sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q== - dependencies: - chain-function "^1.0.0" - dom-helpers "^3.2.0" - loose-envify "^1.3.1" - prop-types "^15.5.6" - warning "^3.0.0" - -react-transition-group@^2.2.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d" - integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg== - dependencies: - dom-helpers "^3.4.0" - loose-envify "^1.4.0" - prop-types "^15.6.2" - react-lifecycles-compat "^3.0.4" - react@^16.14.0, react@^16.8.6: version "16.14.0" resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" @@ -13863,28 +13358,6 @@ recast@^0.20.3: source-map "~0.6.1" tslib "^2.0.1" -"recompose@0.28.0 - 0.30.0": - version "0.30.0" - resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0" - integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w== - dependencies: - "@babel/runtime" "^7.0.0" - change-emitter "^0.1.2" - fbjs "^0.8.1" - hoist-non-react-statics "^2.3.1" - react-lifecycles-compat "^3.0.2" - symbol-observable "^1.0.4" - -recompose@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.26.0.tgz#9babff039cb72ba5bd17366d55d7232fbdfb2d30" - integrity sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog== - dependencies: - change-emitter "^0.1.2" - fbjs "^0.8.1" - hoist-non-react-statics "^2.3.1" - symbol-observable "^1.0.4" - recursive-readdir@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" @@ -14174,11 +13647,6 @@ resolve-from@5.0.0, resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -14339,27 +13807,11 @@ rollup@^2.43.1: optionalDependencies: fsevents "~2.3.2" -rtlcss@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-2.5.0.tgz#455549e49113f9e1cf83169a44de526c816de8a4" - integrity sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g== - dependencies: - chalk "^2.4.2" - findup "^0.1.5" - mkdirp "^0.5.1" - postcss "^6.0.23" - strip-json-comments "^2.0.0" - run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== -run-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" - integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -14367,13 +13819,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^5.5.7: - version "5.5.12" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" - integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw== - dependencies: - symbol-observable "1.0.1" - rxjs@^6.3.3, rxjs@^6.5.2, rxjs@^6.5.5, rxjs@^6.6.0: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" @@ -14504,11 +13949,6 @@ selfsigned@^2.1.1: dependencies: node-forge "^1" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" @@ -14621,11 +14061,6 @@ set-value@^2.0.0, set-value@^2.0.1: is-plain-object "^2.0.3" split-string "^3.0.1" -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" @@ -14709,11 +14144,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -simple-assign@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/simple-assign/-/simple-assign-0.1.0.tgz#17fd3066a5f3d7738f50321bb0f14ca281cc4baa" - integrity sha1-F/0wZqXz13OPUDIbsPFMooHMS6o= - simple-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" @@ -15303,16 +14733,16 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@^2.0.0, strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + style-loader@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" @@ -15362,7 +14792,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.3.0, supports-color@^5.4.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -15440,12 +14870,7 @@ svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= - -symbol-observable@1.2.0, symbol-observable@^1.0.4, symbol-observable@^1.1.0: +symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -16005,11 +15430,6 @@ typescript@^3.6.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== -ua-parser-js@^0.7.18: - version "0.7.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" - integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== - uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -16411,14 +15831,7 @@ walker@^1.0.7: dependencies: makeerror "1.0.x" -warning@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" - integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w= - dependencies: - loose-envify "^1.0.0" - -warning@^4.0.1, warning@^4.0.2: +warning@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== From 0ee632248e3ebf562b96d8fd15a18e7ab3783c82 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 5 Mar 2024 16:53:18 +0100 Subject: [PATCH 18/22] feat: support outlier table plugin (DHIS2-16751) (#2912) --- i18n/en.pot | 20 +- package.json | 7 +- .../ItemContextMenu/ViewAsMenuItems.js | 39 +- .../__tests__/ItemContextMenu.offline.spec.js | 22 +- .../__tests__/ItemContextMenu.spec.js | 22 +- .../__tests__/ViewAsMenuItems.spec.js | 10 +- .../ViewAsMenuItems.spec.js.snap | 142 +-- .../ContentMenuItem.spec.js.snap | 16 +- .../SinglesMenuGroup.spec.js.snap | 22 +- yarn.lock | 868 +++++++++--------- 10 files changed, 599 insertions(+), 569 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index a9f4adf5c..04cb3d4d8 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2023-06-22T08:57:46.931Z\n" -"PO-Revision-Date: 2023-06-22T08:57:46.931Z\n" +"POT-Creation-Date: 2024-02-26T14:42:02.563Z\n" +"PO-Revision-Date: 2024-02-26T14:42:02.563Z\n" msgid "Untitled dashboard" msgstr "Untitled dashboard" @@ -89,14 +89,20 @@ msgstr "View fullscreen" msgid "This map can't be displayed as a chart" msgstr "This map can't be displayed as a chart" +msgid "This map can't be displayed as a pivot table" +msgstr "This map can't be displayed as a pivot table" + +msgid "This visualization can't be displayed as a pivot table" +msgstr "This visualization can't be displayed as a pivot table" + +msgid "This visualization can't be displayed as a map" +msgstr "This visualization can't be displayed as a map" + msgid "View as Chart" msgstr "View as Chart" -msgid "This map can't be displayed as a table" -msgstr "This map can't be displayed as a table" - -msgid "View as Table" -msgstr "View as Table" +msgid "View as Pivot table" +msgstr "View as Pivot table" msgid "View as Map" msgstr "View as Map" diff --git a/package.json b/package.json index c7e7fdc83..f482c82d0 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^26.4.0", + "@dhis2/analytics": "999.9.9-outlier-table.alpha.4", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", "@dhis2/d2-ui-rich-text": "^7.4.3", - "@dhis2/ui": "^8.14.0", + "@dhis2/ui": "^9.2.0", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", "d2": "^31.10.0", @@ -61,5 +61,8 @@ "moduleNameMapper": { "^.+\\.(css|sass|scss)$": "identity-obj-proxy" } + }, + "resolutions": { + "@dhis2/ui": "^9.2.0" } } diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/ViewAsMenuItems.js b/src/components/Item/VisualizationItem/ItemContextMenu/ViewAsMenuItems.js index 8e13c190f..79c582ff4 100644 --- a/src/components/Item/VisualizationItem/ItemContextMenu/ViewAsMenuItems.js +++ b/src/components/Item/VisualizationItem/ItemContextMenu/ViewAsMenuItems.js @@ -1,3 +1,4 @@ +import { VIS_TYPE_OUTLIER_TABLE } from '@dhis2/analytics' import i18n from '@dhis2/d2-i18n' import { IconVisualizationColumn16, IconTable16, IconWorld16 } from '@dhis2/ui' import PropTypes from 'prop-types' @@ -31,17 +32,33 @@ const ViewAsMenuItems = ({ const onViewMap = () => onActiveTypeChanged(MAP) - const notSupported = type === MAP && !getThematicMapViews(visualization) + const notSupported = + (type === MAP && !getThematicMapViews(visualization)) || + (type === CHART && visualization.type === VIS_TYPE_OUTLIER_TABLE) + + const getNotSupportedMessage = (viewAs) => { + if (type === MAP && !getThematicMapViews(visualization)) { + return viewAs === 'chart' + ? i18n.t("This map can't be displayed as a chart") + : i18n.t("This map can't be displayed as a pivot table") + } + + if (type === CHART && visualization.type === VIS_TYPE_OUTLIER_TABLE) { + return viewAs === 'table' + ? i18n.t( + "This visualization can't be displayed as a pivot table" + ) + : i18n.t("This visualization can't be displayed as a map") + } + + return null + } return ( <> {![CHART, EVENT_CHART].includes(activeType) && ( } @@ -65,8 +78,10 @@ const ViewAsMenuItems = ({ )} {hasMapView(type) && activeType !== MAP && ( } /> )} diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.js b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.js index e73d7296b..e1891d484 100644 --- a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.js +++ b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.offline.spec.js @@ -59,7 +59,7 @@ test('renders just the button when menu closed', () => { expect(getByRole('button')).toBeTruthy() expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeNull() @@ -113,7 +113,7 @@ test('renders popover menu for BAR chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -140,7 +140,7 @@ test('renders popover menu for SINGLE_VALUE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -167,7 +167,7 @@ test('renders popover menu for YEAR_OVER_YEAR_LINE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -194,7 +194,7 @@ test('renders popover menu for GAUGE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -221,7 +221,7 @@ test('renders popover menu for PIE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -252,7 +252,7 @@ test('renders popover menu for PIVOT_TABLE', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeTruthy() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -281,7 +281,7 @@ test('renders popover menu for MAP', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeTruthy() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Maps app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -379,7 +379,7 @@ test('renders only View in App when item load failed', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Maps app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeNull() @@ -467,7 +467,7 @@ test('renders correct options for BAR in small screen', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -498,7 +498,7 @@ test('renders correct options for PIE in small screen', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeTruthy() diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.js b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.js index e86bb7a8a..185b54be8 100644 --- a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.js +++ b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ItemContextMenu.spec.js @@ -59,7 +59,7 @@ test('renders just the button when menu closed', () => { expect(getByRole('button')).toBeTruthy() expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeNull() @@ -113,7 +113,7 @@ test('renders popover menu for BAR chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -140,7 +140,7 @@ test('renders popover menu for SINGLE_VALUE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -167,7 +167,7 @@ test('renders popover menu for YEAR_OVER_YEAR_LINE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -194,7 +194,7 @@ test('renders popover menu for GAUGE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -221,7 +221,7 @@ test('renders popover menu for PIE chart', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -252,7 +252,7 @@ test('renders popover menu for PIVOT_TABLE', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeTruthy() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -281,7 +281,7 @@ test('renders popover menu for MAP', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeTruthy() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Maps app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -379,7 +379,7 @@ test('renders only View in App when item load failed', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Maps app')).toBeTruthy() expect(queryByText('Show details and interpretations')).toBeNull() @@ -467,7 +467,7 @@ test('renders correct options for BAR in small screen', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeTruthy() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeTruthy() + expect(queryByText('View as Pivot table')).toBeTruthy() expect(queryByTestId('divider')).toBeTruthy() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeTruthy() @@ -498,7 +498,7 @@ test('renders correct options for PIE in small screen', async () => { await waitFor(() => { expect(queryByText('View as Map')).toBeNull() expect(queryByText('View as Chart')).toBeNull() - expect(queryByText('View as Table')).toBeNull() + expect(queryByText('View as Pivot table')).toBeNull() expect(queryByTestId('divider')).toBeNull() expect(queryByText('Open in Data Visualizer app')).toBeNull() expect(queryByText('Show details and interpretations')).toBeTruthy() diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ViewAsMenuItems.spec.js b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ViewAsMenuItems.spec.js index 71222c0b0..7e478c9ef 100644 --- a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ViewAsMenuItems.spec.js +++ b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/ViewAsMenuItems.spec.js @@ -36,6 +36,9 @@ test('renders menu for active type MAP and type CHART', async () => { const props = Object.assign({}, defaultProps, { type: CHART, activeType: MAP, + visualization: { + type: 'COLUMN', + }, }) const { container } = render() @@ -49,6 +52,9 @@ test('renders disabled menu items when offline', () => { const props = Object.assign({}, defaultProps, { type: CHART, activeType: MAP, + visualization: { + type: 'COLUMN', + }, }) const { container } = render() @@ -105,7 +111,7 @@ test('renders menu for active type REPORT_TABLE and type CHART', async () => { const props = Object.assign({}, defaultProps, { type: CHART, activeType: REPORT_TABLE, - visualization: {}, + visualization: { type: 'COLUMN' }, }) const { container } = render() @@ -118,7 +124,7 @@ test('renders menu for active type CHART and type REPORT_TABLE', async () => { const props = Object.assign({}, defaultProps, { type: REPORT_TABLE, activeType: CHART, - visualization: {}, + visualization: { type: 'PIVOT_TABLE' }, }) const { container } = render() diff --git a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/__snapshots__/ViewAsMenuItems.spec.js.snap b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/__snapshots__/ViewAsMenuItems.spec.js.snap index 85b1b8ce0..da22ae3d1 100644 --- a/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/__snapshots__/ViewAsMenuItems.spec.js.snap +++ b/src/components/Item/VisualizationItem/ItemContextMenu/__tests__/__snapshots__/ViewAsMenuItems.spec.js.snap @@ -3,14 +3,14 @@ exports[`renders disabled menu items when offline 1`] = `
  • - View as Table + View as Pivot table @@ -81,14 +81,14 @@ exports[`renders disabled menu items when offline 1`] = ` exports[`renders menu for active type CHART and type MAP 1`] = `
  • - View as Table + View as Pivot table
  • - View as Table + View as Pivot table
  • - View as Table + View as Pivot table @@ -261,14 +261,14 @@ exports[`renders menu for active type EVENT_CHART and type EVENT_REPORT 1`] = ` exports[`renders menu for active type EVENT_REPORT and type EVENT_CHART 1`] = `
  • - View as Table + View as Pivot table @@ -384,14 +384,14 @@ exports[`renders menu for active type MAP and type CHART 1`] = ` exports[`renders menu for active type MAP and type MAP without Thematic layer 1`] = `
  • - View as Table + View as Pivot table @@ -462,14 +462,14 @@ exports[`renders menu for active type MAP and type MAP without Thematic layer 1` exports[`renders menu for active type MAP and type MAP without Thematic layer when offline 1`] = `
  • - View as Table + View as Pivot table @@ -540,14 +540,14 @@ exports[`renders menu for active type MAP and type MAP without Thematic layer wh exports[`renders menu for active type REPORT_TABLE and type CHART 1`] = `