From 6362f7ec35219997971531345fdde81021493129 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 24 Mar 2024 02:35:40 +0100 Subject: [PATCH 01/73] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/cs.po | 33 ++++++++++++++++++++++++--------- i18n/zh.po | 33 ++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/i18n/cs.po b/i18n/cs.po index 44dc10d9f..ac460b093 100644 --- a/i18n/cs.po +++ b/i18n/cs.po @@ -1,14 +1,14 @@ # # Translators: -# Jiří Podhorecký, 2023 # Philip Larsen Donnelly, 2024 +# Jiří Podhorecký, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Jiří Podhorecký, 2024\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" @@ -160,6 +160,9 @@ msgstr "Matematické operátory" msgid "Data Type" msgstr "Typ dat" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "" + msgid "All types" msgstr "Všechny typy" @@ -190,6 +193,9 @@ msgstr "Nebyly nalezeny žádné datové položky události" msgid "No program indicators found" msgstr "Nebyly nalezeny žádné programové indikátory" +msgid "No calculations found" +msgstr "Nenalezeny žádné výpočty" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "Nebyly nalezeny žádné indikátory pro „{{- searchTerm}}“" @@ -202,6 +208,9 @@ msgstr "Pro „{{- searchTerm}}“ nebyly nalezeny žádné datové položky ud msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "Nebyly nalezeny žádné programové indikátory pro „{{- searchTerm}}“" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "Pro dotaz „{{- searchTerm}}“ nebylo nic nalezeno" @@ -415,12 +424,15 @@ msgstr "Na rozdíl od" msgid "Like" msgstr "Jako" -msgid "Share" -msgstr "Sdílet" - msgid "See interpretation" msgstr "Zobrazit interpretaci" +msgid "Open in app" +msgstr "" + +msgid "Share" +msgstr "Sdílet" + msgid "Manage sharing" msgstr "Spravovat sdílení" @@ -678,15 +690,15 @@ msgstr "Vybrat rok" msgid "Period" msgstr "Období" +msgid "Selected Periods" +msgstr "Vybraná období" + msgid "Relative periods" msgstr "Relativní období" msgid "Fixed periods" msgstr "Pevné období" -msgid "Selected Periods" -msgstr "Vybraná období" - msgid "No periods selected" msgstr "Nejsou vybrána žádná období" @@ -1188,6 +1200,9 @@ msgstr "Rozptyl" msgid "Single value" msgstr "Jedna hodnota" +msgid "Outlier table" +msgstr "" + msgid "All charts" msgstr "Všechny grafy" diff --git a/i18n/zh.po b/i18n/zh.po index 448d6eb61..529b2383d 100644 --- a/i18n/zh.po +++ b/i18n/zh.po @@ -2,15 +2,15 @@ # Translators: # Viktor Varland , 2021 # 晓东 林 <13981924470@126.com>, 2023 -# easylin , 2023 # Philip Larsen Donnelly, 2024 +# easylin , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: easylin , 2024\n" "Language-Team: Chinese (https://app.transifex.com/hisp-uio/teams/100509/zh/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -155,6 +155,9 @@ msgstr "数学运算符" msgid "Data Type" msgstr "数据类型" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "{{dataType}} 只能在 {{visType}} 中使用" + msgid "All types" msgstr "所有类型" @@ -185,6 +188,9 @@ msgstr "找不到事件数据项" msgid "No program indicators found" msgstr "找不到项目指标" +msgid "No calculations found" +msgstr "没有找到计算结果" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "找不到“ {{- searchTerm}}”的指标" @@ -197,6 +203,9 @@ msgstr "找不到“ {{- searchTerm}}”的事件数据项" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "找不到“ {{- searchTerm}}”的计划指标" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "找不到“{{- searchTerm}}”的计算" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "找不到“ {{- searchTerm}}”" @@ -402,12 +411,15 @@ msgstr "不喜欢" msgid "Like" msgstr "喜欢" -msgid "Share" -msgstr "分享" - msgid "See interpretation" msgstr "见解释" +msgid "Open in app" +msgstr "在应用程序中打开" + +msgid "Share" +msgstr "分享" + msgid "Manage sharing" msgstr "管理共享" @@ -637,15 +649,15 @@ msgstr "选择年份" msgid "Period" msgstr "期间" +msgid "Selected Periods" +msgstr "选择的期间" + msgid "Relative periods" msgstr "相对期间" msgid "Fixed periods" msgstr "固定期间" -msgid "Selected Periods" -msgstr "选择的期间" - msgid "No periods selected" msgstr "未选择期间" @@ -1147,6 +1159,9 @@ msgstr "分散" msgid "Single value" msgstr "单个值" +msgid "Outlier table" +msgstr "异常值表" + msgid "All charts" msgstr "所有图表" From a1e15d3f22014dcb0dba8afbbf8382a9925729d9 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 24 Mar 2024 01:39:15 +0000 Subject: [PATCH 02/73] chore(release): cut 26.6.1 [skip ci] ## [26.6.1](https://github.com/dhis2/analytics/compare/v26.6.0...v26.6.1) (2024-03-24) ### Bug Fixes * **translations:** sync translations from transifex (master) ([6362f7e](https://github.com/dhis2/analytics/commit/6362f7ec35219997971531345fdde81021493129)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d219c6bbf..002c5cd79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.1](https://github.com/dhis2/analytics/compare/v26.6.0...v26.6.1) (2024-03-24) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([6362f7e](https://github.com/dhis2/analytics/commit/6362f7ec35219997971531345fdde81021493129)) + # [26.6.0](https://github.com/dhis2/analytics/compare/v26.5.0...v26.6.0) (2024-03-13) diff --git a/package.json b/package.json index 4288bf2a0..4e4f3f129 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.0", + "version": "26.6.1", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From e1eae74a18eabd228c58a91fa19413d4e338c4cc Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 14 Apr 2024 03:41:51 +0200 Subject: [PATCH 03/73] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/es.po | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/i18n/es.po b/i18n/es.po index 369f05475..cfcf5b213 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -8,15 +8,15 @@ # Marta Vila , 2023 # Janeth Cruz, 2023 # Sergio Valenzuela , 2023 -# Enzo Nicolas Rossi , 2024 # Philip Larsen Donnelly, 2024 +# Enzo Nicolas Rossi , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Enzo Nicolas Rossi , 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" @@ -171,6 +171,9 @@ msgstr "Operadores matemáticos" msgid "Data Type" msgstr "Tipo de datos" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "Sólo {{dataType}} se puede utilizar en {{visType}}" + msgid "All types" msgstr "Todos los tipos" @@ -201,6 +204,9 @@ msgstr "No se encontraron elementos para datos de eventos" msgid "No program indicators found" msgstr "No se han encontrado indicadores de programa" +msgid "No calculations found" +msgstr "No se encontraron cálculos" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "No se han encontrado indicadores para \"{{- searchTerm}}\"" @@ -214,6 +220,9 @@ msgstr "" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "No se han encontrado indicadores de programa para \"{{- searchTerm}}\"" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "No se encontraron cálculos para \"{{- searchTerm}}\"" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "No se encontró nada para \"{{- searchTerm}}\"" @@ -429,12 +438,15 @@ msgstr "diferente a" msgid "Like" msgstr "como" -msgid "Share" -msgstr "Compartir" - msgid "See interpretation" msgstr "Ver interpretación" +msgid "Open in app" +msgstr "Abrir en la aplicación" + +msgid "Share" +msgstr "Compartir" + msgid "Manage sharing" msgstr "Administrar compartir" @@ -688,15 +700,15 @@ msgstr "Seleccionar año" msgid "Period" msgstr "Periodo" +msgid "Selected Periods" +msgstr "Periodos seleccionados" + msgid "Relative periods" msgstr "Periodos relativos" msgid "Fixed periods" msgstr "Periodos fijos" -msgid "Selected Periods" -msgstr "Periodos seleccionados" - msgid "No periods selected" msgstr "No se ha seleccionado ningún periodo" @@ -1200,6 +1212,9 @@ msgstr "Dispersión" msgid "Single value" msgstr "Valor único" +msgid "Outlier table" +msgstr "tabla de valores atípicos" + msgid "All charts" msgstr "Todos los gráficos" From 5fb931113cb8039e73d4a245bcb9f8a09ef50a0a Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 14 Apr 2024 01:45:43 +0000 Subject: [PATCH 04/73] chore(release): cut 26.6.2 [skip ci] ## [26.6.2](https://github.com/dhis2/analytics/compare/v26.6.1...v26.6.2) (2024-04-14) ### Bug Fixes * **translations:** sync translations from transifex (master) ([e1eae74](https://github.com/dhis2/analytics/commit/e1eae74a18eabd228c58a91fa19413d4e338c4cc)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 002c5cd79..65cdbe567 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.2](https://github.com/dhis2/analytics/compare/v26.6.1...v26.6.2) (2024-04-14) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([e1eae74](https://github.com/dhis2/analytics/commit/e1eae74a18eabd228c58a91fa19413d4e338c4cc)) + ## [26.6.1](https://github.com/dhis2/analytics/compare/v26.6.0...v26.6.1) (2024-03-24) diff --git a/package.json b/package.json index 4e4f3f129..473d370e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.1", + "version": "26.6.2", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From 98580ae8c9a7b0cb723a4712bf2da953b2e6b613 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Fri, 19 Apr 2024 13:53:13 +0200 Subject: [PATCH 05/73] fix(aboutAOUnit): newlines missing in AO description (#1655) Fixes https://dhis2.atlassian.net/browse/DHIS2-15914 Set white-space pre-line to preserve newlines --- src/components/AboutAOUnit/AboutAOUnit.js | 1 + src/components/AboutAOUnit/styles/AboutAOUnit.style.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/components/AboutAOUnit/AboutAOUnit.js b/src/components/AboutAOUnit/AboutAOUnit.js index 76002a453..0d734efc1 100644 --- a/src/components/AboutAOUnit/AboutAOUnit.js +++ b/src/components/AboutAOUnit/AboutAOUnit.js @@ -193,6 +193,7 @@ const AboutAOUnit = forwardRef(({ type, id, renderId }, ref) => {

diff --git a/src/components/AboutAOUnit/styles/AboutAOUnit.style.js b/src/components/AboutAOUnit/styles/AboutAOUnit.style.js index fdabe3898..f95205a83 100644 --- a/src/components/AboutAOUnit/styles/AboutAOUnit.style.js +++ b/src/components/AboutAOUnit/styles/AboutAOUnit.style.js @@ -48,6 +48,10 @@ export default css` flex-shrink: 0; } + .description { + white-space: pre-line; + } + .noDescription { color: ${colors.grey600}; } From c0befe77c617fae9d29a94260ee498b437a2b62e Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Fri, 19 Apr 2024 11:56:55 +0000 Subject: [PATCH 06/73] chore(release): cut 26.6.3 [skip ci] ## [26.6.3](https://github.com/dhis2/analytics/compare/v26.6.2...v26.6.3) (2024-04-19) ### Bug Fixes * **aboutAOUnit:** newlines missing in AO description ([#1655](https://github.com/dhis2/analytics/issues/1655)) ([98580ae](https://github.com/dhis2/analytics/commit/98580ae8c9a7b0cb723a4712bf2da953b2e6b613)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65cdbe567..972ff5c98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.3](https://github.com/dhis2/analytics/compare/v26.6.2...v26.6.3) (2024-04-19) + + +### Bug Fixes + +* **aboutAOUnit:** newlines missing in AO description ([#1655](https://github.com/dhis2/analytics/issues/1655)) ([98580ae](https://github.com/dhis2/analytics/commit/98580ae8c9a7b0cb723a4712bf2da953b2e6b613)) + ## [26.6.2](https://github.com/dhis2/analytics/compare/v26.6.1...v26.6.2) (2024-04-14) diff --git a/package.json b/package.json index 473d370e2..e785ae245 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.2", + "version": "26.6.3", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From 4b35e6910db17ddbd96b4030ee528b82f045b7e4 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 21 Apr 2024 03:36:37 +0200 Subject: [PATCH 07/73] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/vi.po | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/i18n/vi.po b/i18n/vi.po index ae58444ca..e7f86c0c6 100644 --- a/i18n/vi.po +++ b/i18n/vi.po @@ -3,13 +3,14 @@ # Mai Nguyen , 2022 # Viktor Varland , 2023 # Philip Larsen Donnelly, 2024 +# Thuy Nguyen , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Philip Larsen Donnelly, 2024\n" +"Last-Translator: Thuy Nguyen , 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" @@ -79,7 +80,7 @@ msgid "This app could not retrieve required data." msgstr "" msgid "Network error" -msgstr "" +msgstr "Lỗi mạng" msgid "Data / Edit calculation" msgstr "" @@ -88,7 +89,7 @@ msgid "Data / New calculation" msgstr "" msgid "Remove item" -msgstr "" +msgstr "Bỏ mặt hàng" msgid "Check formula" msgstr "" @@ -154,6 +155,9 @@ msgstr "" msgid "Data Type" msgstr "Loại dữ liệu" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "" + msgid "All types" msgstr "Các loại" @@ -184,6 +188,9 @@ msgstr "" msgid "No program indicators found" msgstr "" +msgid "No calculations found" +msgstr "" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "" @@ -196,6 +203,9 @@ msgstr "" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "" @@ -401,12 +411,15 @@ msgstr "Không thích" msgid "Like" msgstr "Thích" -msgid "Share" -msgstr "Chia sẻ" - msgid "See interpretation" msgstr "" +msgid "Open in app" +msgstr "" + +msgid "Share" +msgstr "Chia sẻ" + msgid "Manage sharing" msgstr "Quản lý chia sẻ" @@ -636,15 +649,15 @@ msgstr "Chọn năm" msgid "Period" msgstr "Thời điểm" +msgid "Selected Periods" +msgstr "Thời điểm đã chọn" + msgid "Relative periods" msgstr "Thời điểm tương đối" msgid "Fixed periods" msgstr "Thời điểm tĩnh" -msgid "Selected Periods" -msgstr "Thời điểm đã chọn" - msgid "No periods selected" msgstr "Chưa chọn thời điểm" @@ -1146,6 +1159,9 @@ msgstr "phân tán" msgid "Single value" msgstr "Giá trị đơn" +msgid "Outlier table" +msgstr "" + msgid "All charts" msgstr "" From 21f87753464e67e8986223a6fa5d64b64b73f55f Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 21 Apr 2024 01:40:24 +0000 Subject: [PATCH 08/73] chore(release): cut 26.6.4 [skip ci] ## [26.6.4](https://github.com/dhis2/analytics/compare/v26.6.3...v26.6.4) (2024-04-21) ### Bug Fixes * **translations:** sync translations from transifex (master) ([4b35e69](https://github.com/dhis2/analytics/commit/4b35e6910db17ddbd96b4030ee528b82f045b7e4)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 972ff5c98..4b7f2970e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.4](https://github.com/dhis2/analytics/compare/v26.6.3...v26.6.4) (2024-04-21) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([4b35e69](https://github.com/dhis2/analytics/commit/4b35e6910db17ddbd96b4030ee528b82f045b7e4)) + ## [26.6.3](https://github.com/dhis2/analytics/compare/v26.6.2...v26.6.3) (2024-04-19) diff --git a/package.json b/package.json index e785ae245..7fdd017f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.3", + "version": "26.6.4", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From e65e917e32fcb28759a913ddc55d98478f6c4d27 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 22 Apr 2024 11:45:36 +0200 Subject: [PATCH 09/73] fix(interpretations): plugin flashes when interacting with Interpretations modal (#1608) Part of fix for https://dhis2.atlassian.net/browse/DHIS2-15570 Memoize the filter object to prevent unnecessary refetching/re-rendering. --- .../InterpretationModal/InterpretationModal.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/Interpretations/InterpretationModal/InterpretationModal.js b/src/components/Interpretations/InterpretationModal/InterpretationModal.js index 1be7ae74f..425eb053c 100644 --- a/src/components/Interpretations/InterpretationModal/InterpretationModal.js +++ b/src/components/Interpretations/InterpretationModal/InterpretationModal.js @@ -14,7 +14,7 @@ import { } from '@dhis2/ui' import cx from 'classnames' import PropTypes from 'prop-types' -import React, { useEffect, useState } from 'react' +import React, { useEffect, useState, useMemo } from 'react' import css from 'styled-jsx/css' import { InterpretationThread } from './InterpretationThread.js' import { useModalContentWidth } from './useModalContentWidth.js' @@ -116,6 +116,12 @@ const InterpretationModal = ({ } }, [interpretationId, refetch]) + const filters = useMemo(() => { + return { + relativePeriodDate: interpretation?.created, + } + }, [interpretation?.created]) + return ( <> {loadingInProgress && ( @@ -163,10 +169,7 @@ const InterpretationModal = ({

From 0ae3182231ca8de573de61955bf8234401880098 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Mon, 22 Apr 2024 09:49:10 +0000 Subject: [PATCH 10/73] chore(release): cut 26.6.5 [skip ci] ## [26.6.5](https://github.com/dhis2/analytics/compare/v26.6.4...v26.6.5) (2024-04-22) ### Bug Fixes * **interpretations:** plugin flashes when interacting with Interpretations modal ([#1608](https://github.com/dhis2/analytics/issues/1608)) ([e65e917](https://github.com/dhis2/analytics/commit/e65e917e32fcb28759a913ddc55d98478f6c4d27)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b7f2970e..acb1b2f7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.5](https://github.com/dhis2/analytics/compare/v26.6.4...v26.6.5) (2024-04-22) + + +### Bug Fixes + +* **interpretations:** plugin flashes when interacting with Interpretations modal ([#1608](https://github.com/dhis2/analytics/issues/1608)) ([e65e917](https://github.com/dhis2/analytics/commit/e65e917e32fcb28759a913ddc55d98478f6c4d27)) + ## [26.6.4](https://github.com/dhis2/analytics/compare/v26.6.3...v26.6.4) (2024-04-21) diff --git a/package.json b/package.json index 7fdd017f5..2966c8b8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.4", + "version": "26.6.5", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From 746dbb97a1bd58b7a921d3a470b113d20b19d2ac Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 28 Apr 2024 03:37:10 +0200 Subject: [PATCH 11/73] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/lo.po | 34 +++++++++++++++++++++++++--------- i18n/nb.po | 34 +++++++++++++++++++++++++--------- i18n/sv.po | 38 +++++++++++++++++++++++++++----------- 3 files changed, 77 insertions(+), 29 deletions(-) diff --git a/i18n/lo.po b/i18n/lo.po index b41993e0e..42249273c 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -5,13 +5,14 @@ # Philip Larsen Donnelly, 2023 # Phouthasinh PHEUAYSITHIPHONE, 2023 # Saysamone Sibounma, 2023 +# Namwan Chanthavisouk, 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Saysamone Sibounma, 2023\n" +"Last-Translator: Namwan Chanthavisouk, 2024\n" "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +42,7 @@ msgid "No description" msgstr "ບໍ່ມີລາຍລະອຽດ" msgid "Last updated {{time}}" -msgstr "" +msgstr "ແກ້ໄຂລ່າສຸດ {{time}}" msgid "Created {{time}} by {{author}}" msgstr "" @@ -156,6 +157,9 @@ msgstr "" msgid "Data Type" msgstr "" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "" + msgid "All types" msgstr "" @@ -186,6 +190,9 @@ msgstr "" msgid "No program indicators found" msgstr "" +msgid "No calculations found" +msgstr "" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "" @@ -198,6 +205,9 @@ msgstr "" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "" @@ -403,12 +413,15 @@ msgstr "ບໍ່ມັກ" msgid "Like" msgstr "ມັກ" -msgid "Share" -msgstr "ເຜີຍແຜ່" - msgid "See interpretation" msgstr "" +msgid "Open in app" +msgstr "" + +msgid "Share" +msgstr "ເຜີຍແຜ່" + msgid "Manage sharing" msgstr "" @@ -638,15 +651,15 @@ msgstr "" msgid "Period" msgstr "ຊ່ວງເວລາ" +msgid "Selected Periods" +msgstr "" + msgid "Relative periods" msgstr "​ໄລ​ຍະ​ເວ​ລາ​ໄກ້​ຄຽງ" msgid "Fixed periods" msgstr "ໄລຍະເວລາທີ່ໄດ້ກຳນົດ" -msgid "Selected Periods" -msgstr "" - msgid "No periods selected" msgstr "ບໍ່ທັນໄດ້ເລືອກໄລຍະເວລາ" @@ -1148,6 +1161,9 @@ msgstr "" msgid "Single value" msgstr "" +msgid "Outlier table" +msgstr "" + msgid "All charts" msgstr "" diff --git a/i18n/nb.po b/i18n/nb.po index 4b3e968d1..9031e2d2c 100644 --- a/i18n/nb.po +++ b/i18n/nb.po @@ -3,13 +3,14 @@ # Caroline Hesthagen Holen , 2023 # Jen Jones Arnesen , 2023 # Karoline Tufte Lien , 2023 +# Martin , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Karoline Tufte Lien , 2023\n" +"Last-Translator: Martin , 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" @@ -155,6 +156,9 @@ msgstr "" msgid "Data Type" msgstr "Datatype" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "" + msgid "All types" msgstr "Alle typer" @@ -185,6 +189,9 @@ msgstr "Ingen hendelsesdataelementer funnet" msgid "No program indicators found" msgstr "Ingen programindikatorer funnet" +msgid "No calculations found" +msgstr "" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "Ingen indikatorer funnet for \"{{- searchTerm}}\"" @@ -197,6 +204,9 @@ msgstr "Ingen hendelsesdataelementer funnet for \"{{- searchTerm}}\"" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "Ingen programindikatorer funnet for \"{{- searchTerm}}\"" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "Ingenting funnet for \"{{- searchTerm}}\"" @@ -406,12 +416,15 @@ msgstr "Fjern like" msgid "Like" msgstr "Like" -msgid "Share" -msgstr "Del" - msgid "See interpretation" msgstr "" +msgid "Open in app" +msgstr "" + +msgid "Share" +msgstr "Del" + msgid "Manage sharing" msgstr "Administrer deling" @@ -646,15 +659,15 @@ msgstr "Velg år" msgid "Period" msgstr "Periode" +msgid "Selected Periods" +msgstr "Valgte perioder" + msgid "Relative periods" msgstr "Relative perioder" msgid "Fixed periods" msgstr "Faste perioder" -msgid "Selected Periods" -msgstr "Valgte perioder" - msgid "No periods selected" msgstr "Ingen perioder er valgt" @@ -983,7 +996,7 @@ msgid "Event data item" msgstr "Hendelsesdatapunkt" msgid "No programs found" -msgstr "" +msgstr "Ingen programmer funnet" msgid "Loading programs" msgstr "" @@ -1156,6 +1169,9 @@ msgstr " Spredning" msgid "Single value" msgstr "Enkeltverdi" +msgid "Outlier table" +msgstr "" + msgid "All charts" msgstr "Alle diagrammer" diff --git a/i18n/sv.po b/i18n/sv.po index 4148939cc..9bdb02c5d 100644 --- a/i18n/sv.po +++ b/i18n/sv.po @@ -3,13 +3,14 @@ # Viktor Varland , 2022 # Philip Larsen Donnelly, 2023 # Jason Pickering , 2024 +# Martin , 2024 # msgid "" msgstr "" "Project-Id-Version: i18next-conv\n" -"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n" +"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n" "PO-Revision-Date: 2020-04-28 22:05+0000\n" -"Last-Translator: Jason Pickering , 2024\n" +"Last-Translator: Martin , 2024\n" "Language-Team: Swedish (https://app.transifex.com/hisp-uio/teams/100509/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -155,6 +156,9 @@ msgstr "" msgid "Data Type" msgstr "" +msgid "Only {{dataType}} can be used in {{visType}}" +msgstr "" + msgid "All types" msgstr "" @@ -185,6 +189,9 @@ msgstr "" msgid "No program indicators found" msgstr "" +msgid "No calculations found" +msgstr "" + msgid "No indicators found for \"{{- searchTerm}}\"" msgstr "" @@ -197,6 +204,9 @@ msgstr "" msgid "No program indicators found for \"{{- searchTerm}}\"" msgstr "" +msgid "No calculations found for \"{{- searchTerm}}\"" +msgstr "" + msgid "Nothing found for \"{{- searchTerm}}\"" msgstr "" @@ -210,10 +220,10 @@ msgid "All metrics" msgstr "" msgid "Move to {{axisName}}" -msgstr "" +msgstr "Flytta till {{axisName}}" msgid "Add to {{axisName}}" -msgstr "" +msgstr "Lägg till i {{axisName}}" msgid "Not available for {{visualizationType}}" msgstr "" @@ -403,12 +413,15 @@ msgstr "" msgid "Like" msgstr "" -msgid "Share" -msgstr "Dela med sig" - msgid "See interpretation" msgstr "" +msgid "Open in app" +msgstr "" + +msgid "Share" +msgstr "Dela med sig" + msgid "Manage sharing" msgstr "" @@ -588,7 +601,7 @@ msgid "Options" msgstr "Alternativ" msgid "Hide" -msgstr "" +msgstr "Göm" msgid "{{count}} org units" msgid_plural "{{count}} org units" @@ -641,13 +654,13 @@ msgstr "Välj år" msgid "Period" msgstr "Period" -msgid "Relative periods" +msgid "Selected Periods" msgstr "" -msgid "Fixed periods" +msgid "Relative periods" msgstr "" -msgid "Selected Periods" +msgid "Fixed periods" msgstr "" msgid "No periods selected" @@ -1151,6 +1164,9 @@ msgstr "" msgid "Single value" msgstr "" +msgid "Outlier table" +msgstr "" + msgid "All charts" msgstr "" From e6fa087afc9cd80f3297e053512208b7ccf966ca Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 28 Apr 2024 01:40:44 +0000 Subject: [PATCH 12/73] chore(release): cut 26.6.6 [skip ci] ## [26.6.6](https://github.com/dhis2/analytics/compare/v26.6.5...v26.6.6) (2024-04-28) ### Bug Fixes * **translations:** sync translations from transifex (master) ([746dbb9](https://github.com/dhis2/analytics/commit/746dbb97a1bd58b7a921d3a470b113d20b19d2ac)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acb1b2f7f..27a5058d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.6](https://github.com/dhis2/analytics/compare/v26.6.5...v26.6.6) (2024-04-28) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([746dbb9](https://github.com/dhis2/analytics/commit/746dbb97a1bd58b7a921d3a470b113d20b19d2ac)) + ## [26.6.5](https://github.com/dhis2/analytics/compare/v26.6.4...v26.6.5) (2024-04-22) diff --git a/package.json b/package.json index 2966c8b8f..c42d758ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.5", + "version": "26.6.6", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From cfc3e55231fd84d0bd5b4eff8c8b9e5bc3e05480 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 5 May 2024 03:37:35 +0200 Subject: [PATCH 13/73] fix(translations): sync translations from transifex (master) Automatically merged. --- i18n/lo.po | 118 +++++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/i18n/lo.po b/i18n/lo.po index 42249273c..9aa92e528 100644 --- a/i18n/lo.po +++ b/i18n/lo.po @@ -21,22 +21,22 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "view only" -msgstr "" +msgstr "ເບິ່ງຢ່າງດຽວ" msgid "view and edit" -msgstr "" +msgstr "ເບິ່ງ ແລະ ແກ້ໄຂ" msgid "all users ({{accessLevel}})" -msgstr "" +msgstr "ຜູ້ໃຊ້ທັງໝົດ {{accessLevel}}" msgid "{{userOrGroup}} ({{accessLevel}})" -msgstr "" +msgstr " {{userOrGroup}} ({{accessLevel}} )" msgid "Shared with {{commaSeparatedListOfUsersAndGroups}}" -msgstr "" +msgstr "ແບ່ງປັນໃຫ້ກັບ {{commaSeparatedListOfUsersAndGroups}}" msgid "Not shared with any users or groups" -msgstr "" +msgstr "ບໍ່ໃຫ້ແບ່ງປັນກັບຜູ້ໃຊ້ ແລະ ກຸ່ມອື່ນ" msgid "No description" msgstr "ບໍ່ມີລາຍລະອຽດ" @@ -45,91 +45,93 @@ msgid "Last updated {{time}}" msgstr "ແກ້ໄຂລ່າສຸດ {{time}}" msgid "Created {{time}} by {{author}}" -msgstr "" +msgstr "ສ້າງ {{time}} ໂດຍ {{author}}" msgid "Created {{time}}" -msgstr "" +msgstr "ສ້າງ {{time}}" msgid "Viewed {{count}} times" msgid_plural "Viewed {{count}} times" -msgstr[0] "" +msgstr[0] "ກວດເບິ່ງ {{count}} ຄັ້ງ" msgid "Notifications" -msgstr "" +msgstr "ການແຈ້ງເຕືອນ" msgid "You're subscribed and getting updates about new interpretations." -msgstr "" +msgstr "ທ່ານກົດປູ່ມສະໜັກ ເພື່ອຈະໄດ້ອັບເດດ ແລະ ຮັບຂໍ້ມູນໃໝ່" msgid "Unsubscribe" -msgstr "" +msgstr "ຍົກເລີກການສະໝັກ" msgid "Subscribe to get updates about new interpretations." -msgstr "" +msgstr "ສະໝັກເພື່ອທີ່ຈະຮັບຮູ້ຂໍ້ມູນໃໝ່" msgid "Subscribe" -msgstr "" +msgstr "ສະໝັກ" msgid "About this map" -msgstr "" +msgstr "ກ່ຽວກັບແຜນທີ່" msgid "About this line list" -msgstr "" +msgstr "ກ່ຽວກັບບັນຊີລາຍຊື່" msgid "About this visualization" -msgstr "" +msgstr "ກ່ຽວກັບການສ້າງພາບຂໍ້ມູນ" msgid "This app could not retrieve required data." -msgstr "" +msgstr "ແອັບນີ້ບໍ່ສາມາດດຶງຂໍ້ມູນທີ່ຕ້ອງການໄດ້" msgid "Network error" msgstr "ຂໍ້ຜິດພາດທາງເຄື່ອຂ່າຍ" msgid "Data / Edit calculation" -msgstr "" +msgstr "ຂໍ້ມູນ / ແກ້ໄຂການຄິດໄລ່" msgid "Data / New calculation" -msgstr "" +msgstr "ຂໍ້ມູນ / ຄິດໄລ່ໃໝ່" msgid "Remove item" msgstr "ລົບລາຍການ" msgid "Check formula" -msgstr "" +msgstr "ກວດເບິ່ງສູດ" msgid "Calculation name" -msgstr "" +msgstr "ຊື່ການຄິດໄລ່" msgid "Shown in table headers and chart axes/legends" -msgstr "" +msgstr "ສະ​ແດງ​​ຢູ່​ເທິງຕາ​ຕະ​ລາງ​ ແລະ​ ແກນ​ແຜນ​ວາດ" msgid "Delete calculation" -msgstr "" +msgstr "ລົບການຄິດໄລ່" msgid "Cancel" -msgstr "Cancel" +msgstr "ຍົກເລີກ" msgid "The calculation can only be saved with a valid formula" -msgstr "" +msgstr "ການຄິດໄລ່ແມ່ນຖືກບັນທຶກດ້ວຍສູດທີ່ຖືກຕ້ອງເທົ່ານັ້ນ" msgid "Add a name to save this calculation" -msgstr "" +msgstr "ເພີ່ມຊື່ເພື່ບັນທຶກການຄິດໄລ່" msgid "Save calculation" -msgstr "" +msgstr "ບັນທຶກການຄິດໄລ່" msgid "" "Are you sure you want to delete this calculation? It may be used by other " "visualizations." msgstr "" +"ເຈົ້າແນ່ໃຈບໍ່ສິລືບຂໍ້ມູນການຄິດໄລ່ນີ້? " +"ຂໍ້ມູນດັ້ງກ່າວອາດຈະຖືກນໍາໃຊ້ໃນການສ້າງພາບຂໍ້ມູນໃໝ່ກໍ່ເປັນໄດ້" msgid "Yes, delete" -msgstr "" +msgstr "ຢືນຢັນ, ລົບ" msgid "Totals only" -msgstr "" +msgstr "ທັງໝົດເທົ່ານັ້ນ" msgid "Details only" -msgstr "" +msgstr "ລາຍລະອຽດເທົ່ານັ້ນ" msgid "Loading" msgstr "ກໍາລັງໂຫຼດ" @@ -138,30 +140,30 @@ msgid "Data elements" msgstr "ອົງປະກອບຂໍ້ມູນ" msgid "Search by data element name" -msgstr "" +msgstr "ຄົ້ນຫາໂດຍຊື່ອົງປະກອບຂໍ້ມູນ" msgid "No data elements found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບອົງປະກອບຂໍ້ມູນຂອງ \"{{- searchTerm}}\"" msgid "No data elements found" -msgstr "" +msgstr "ບໍ່ພົບອົງປະກອບຂໍ໊ມູນ" msgid "" "Drag items here, or double click in the list, to start building a " "calculation formula" -msgstr "" +msgstr "ລາກລາຍການມາບ່ອນນີ້, ຫຼືຄລິກສອງເທື່ອໃນລາຍການເພື່ອສ້າງສູດການຄິດໄລ່" msgid "Math operators" msgstr "" msgid "Data Type" -msgstr "" +msgstr "ຊະນິດຂໍ້ມູນ" msgid "Only {{dataType}} can be used in {{visType}}" -msgstr "" +msgstr "ມີພຽງ {{dataType}} ທີສາມາດໃຊ້ໃນ {{visType}}" msgid "All types" -msgstr "" +msgstr "ທຸກຊະນິດ" msgid "Disaggregation" msgstr "Disaggregation" @@ -170,49 +172,49 @@ msgid "No data" msgstr "ບໍ່ມີຂໍ້ມູນ" msgid "Search by data item name" -msgstr "" +msgstr "ຄົ້ນຫາໂດຍຊື່ລາຍການຂໍ້ມູນ" msgid "No items selected" -msgstr "" +msgstr "ບໍ່ມີລາຍການທີ່ຖືກເລືອກ" msgid "Selected Items" -msgstr "" +msgstr "ລາຍການທີ່ເລືອກ" msgid "No indicators found" -msgstr "" +msgstr "ບໍ່ພົບຕົວຊີ້ວັດ" msgid "No data sets found" -msgstr "" +msgstr "ບໍ່ພົບຊຸດຂໍ້ມູນ" msgid "No event data items found" -msgstr "" +msgstr "ບໍ່ພົບຂໍ້ມູນເຫດການ" msgid "No program indicators found" -msgstr "" +msgstr "ບໍ່ພົບໂປຼແກຼມຕົວຊີ້ວັດ" msgid "No calculations found" -msgstr "" +msgstr "ບໍ່ພົບການຄິດໄລ່" msgid "No indicators found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບຕົວຊີ້ວັດສຳລັບ \"{{- searchTerm}}\"" msgid "No data sets found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບຊຸດຂໍ້ມູນສຳລັບ \"{{- searchTerm}}\"" msgid "No event data items found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບຂໍ້ມູນເຫດການສຳລັບ \"{{- searchTerm}}\"" msgid "No program indicators found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບໂປຼແກຼມຕົວຊີ້ວັດສຳລັບ \"{{- searchTerm}}\"" msgid "No calculations found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບການຄິດໄລ່ສຳລັບ \"{{- serachTerm}}\"" msgid "Nothing found for \"{{- searchTerm}}\"" -msgstr "" +msgstr "ບໍ່ພົບຫຍັງສຳລັບ \"{{- searchTerm}}\"" msgid "Calculation" -msgstr "" +msgstr "ການຄິດໄລ່" msgid "Metric type" msgstr "" @@ -221,19 +223,19 @@ msgid "All metrics" msgstr "ທຸກການປັບປຸງ" msgid "Move to {{axisName}}" -msgstr "" +msgstr "ຍ້າຍໄປ {{axisName}}" msgid "Add to {{axisName}}" -msgstr "" +msgstr "ເພີ່ມໃສ່ {{axisName}}" msgid "Not available for {{visualizationType}}" -msgstr "" +msgstr "ບໍ່ມີສໍາລັບ {{visualizationType}}" msgid "Remove Assigned Categories" -msgstr "" +msgstr "ລົບກຸ່ມທີ່ຖືກມອບໝາຍ" msgid "Add Assigned Categories" -msgstr "" +msgstr "ເພີ່ມກຸ່ມທີ່ຖືກມອບໝາຍ" msgid "Remove" msgstr "ລົບອອກ" From eef1caf98ff4ff35435fa25c06a64a697810dca2 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Sun, 5 May 2024 01:41:19 +0000 Subject: [PATCH 14/73] chore(release): cut 26.6.7 [skip ci] ## [26.6.7](https://github.com/dhis2/analytics/compare/v26.6.6...v26.6.7) (2024-05-05) ### Bug Fixes * **translations:** sync translations from transifex (master) ([cfc3e55](https://github.com/dhis2/analytics/commit/cfc3e55231fd84d0bd5b4eff8c8b9e5bc3e05480)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a5058d3..474e2a1d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.7](https://github.com/dhis2/analytics/compare/v26.6.6...v26.6.7) (2024-05-05) + + +### Bug Fixes + +* **translations:** sync translations from transifex (master) ([cfc3e55](https://github.com/dhis2/analytics/commit/cfc3e55231fd84d0bd5b4eff8c8b9e5bc3e05480)) + ## [26.6.6](https://github.com/dhis2/analytics/compare/v26.6.5...v26.6.6) (2024-04-28) diff --git a/package.json b/package.json index c42d758ed..987cb91fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.6", + "version": "26.6.7", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From be6ea56d1c733aba497d669184668f96e8ae344b Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Mon, 6 May 2024 13:21:16 +0200 Subject: [PATCH 15/73] fix: fix a crash when row totals is enabled (DHIS2-17297) (#1660) --- src/modules/pivotTable/PivotTableEngine.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/modules/pivotTable/PivotTableEngine.js b/src/modules/pivotTable/PivotTableEngine.js index b5788fee1..7b90e0935 100644 --- a/src/modules/pivotTable/PivotTableEngine.js +++ b/src/modules/pivotTable/PivotTableEngine.js @@ -515,9 +515,19 @@ export class PivotTableEngine { if (!this.data[row]) { return undefined } + const cellValue = this.data[row][column] - if (cellValue && !Array.isArray(cellValue)) { + if (!cellValue) { + // Empty cell + // The cell still needs to get the valueType to render correctly 0 and cumulative values + return { + valueType: VALUE_TYPE_NUMBER, + totalAggregationType: AGGREGATE_TYPE_SUM, + } + } + + if (!Array.isArray(cellValue)) { // This is a total cell return { valueType: cellValue.valueType, @@ -532,6 +542,7 @@ export class PivotTableEngine { const dxRowIndex = this.dimensionLookup.rows.findIndex( (dim) => dim.isDxDimension ) + if (rowHeaders.length && dxRowIndex !== -1) { return { valueType: rowHeaders[dxRowIndex].valueType, @@ -553,11 +564,6 @@ export class PivotTableEngine { } } - // Empty cell - // The cell still needs to get the valueType to render correctly 0 and cumulative values - // - // OR - // // Data is in Filter // TODO : This assumes the server ignores text types, we should confirm this is the case return { From 743d7ff33bafe7cfab90499852cc131817739451 Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Mon, 6 May 2024 11:29:04 +0000 Subject: [PATCH 16/73] chore(release): cut 26.6.8 [skip ci] ## [26.6.8](https://github.com/dhis2/analytics/compare/v26.6.7...v26.6.8) (2024-05-06) ### Bug Fixes * fix a crash when row totals is enabled (DHIS2-17297) ([#1660](https://github.com/dhis2/analytics/issues/1660)) ([be6ea56](https://github.com/dhis2/analytics/commit/be6ea56d1c733aba497d669184668f96e8ae344b)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 474e2a1d1..0caea741d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.8](https://github.com/dhis2/analytics/compare/v26.6.7...v26.6.8) (2024-05-06) + + +### Bug Fixes + +* fix a crash when row totals is enabled (DHIS2-17297) ([#1660](https://github.com/dhis2/analytics/issues/1660)) ([be6ea56](https://github.com/dhis2/analytics/commit/be6ea56d1c733aba497d669184668f96e8ae344b)) + ## [26.6.7](https://github.com/dhis2/analytics/compare/v26.6.6...v26.6.7) (2024-05-05) diff --git a/package.json b/package.json index 987cb91fb..6ca9354f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.7", + "version": "26.6.8", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From 899358d5ea5a486f299ab54ded7b3184608e4bf7 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 8 May 2024 11:28:50 +0300 Subject: [PATCH 17/73] fix: system / user setting for display name not respected in Org Unit tree (DHIS2-15000) (#1664) --- src/components/OrgUnitDimension/OrgUnitDimension.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/OrgUnitDimension/OrgUnitDimension.js b/src/components/OrgUnitDimension/OrgUnitDimension.js index 3516daf46..5d2d7115a 100644 --- a/src/components/OrgUnitDimension/OrgUnitDimension.js +++ b/src/components/OrgUnitDimension/OrgUnitDimension.js @@ -40,6 +40,7 @@ const OrgUnitDimension = ({ hideLevelSelect, hideUserOrgUnits, warning, + displayNameProp, }) => { const [ouLevels, setOuLevels] = useState([]) const [ouGroups, setOuGroups] = useState([]) @@ -79,13 +80,16 @@ const OrgUnitDimension = ({ setOuLevels(result) } const doFetchOuGroups = async () => { - const result = await apiFetchOrganisationUnitGroups(dataEngine) + const result = await apiFetchOrganisationUnitGroups( + dataEngine, + displayNameProp + ) setOuGroups(result) } !hideLevelSelect && doFetchOuLevels() !hideGroupSelect && doFetchOuGroups() - }, [dataEngine, hideLevelSelect, hideGroupSelect]) + }, [dataEngine, hideLevelSelect, hideGroupSelect, displayNameProp]) const onLevelChange = (ids) => { const items = ids.map((id) => ({ @@ -369,6 +373,7 @@ OrgUnitDimension.defaultProps = { } OrgUnitDimension.propTypes = { + displayNameProp: PropTypes.string, hideGroupSelect: PropTypes.bool, hideLevelSelect: PropTypes.bool, hideUserOrgUnits: PropTypes.bool, From 8b97385b5fddee7cc5bf43ebe48e786bcddcdaab Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 8 May 2024 08:32:26 +0000 Subject: [PATCH 18/73] chore(release): cut 26.6.9 [skip ci] ## [26.6.9](https://github.com/dhis2/analytics/compare/v26.6.8...v26.6.9) (2024-05-08) ### Bug Fixes * system / user setting for display name not respected in Org Unit tree (DHIS2-15000) ([#1664](https://github.com/dhis2/analytics/issues/1664)) ([899358d](https://github.com/dhis2/analytics/commit/899358d5ea5a486f299ab54ded7b3184608e4bf7)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0caea741d..994a346cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [26.6.9](https://github.com/dhis2/analytics/compare/v26.6.8...v26.6.9) (2024-05-08) + + +### Bug Fixes + +* system / user setting for display name not respected in Org Unit tree (DHIS2-15000) ([#1664](https://github.com/dhis2/analytics/issues/1664)) ([899358d](https://github.com/dhis2/analytics/commit/899358d5ea5a486f299ab54ded7b3184608e4bf7)) + ## [26.6.8](https://github.com/dhis2/analytics/compare/v26.6.7...v26.6.8) (2024-05-06) diff --git a/package.json b/package.json index 6ca9354f5..059a404a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.8", + "version": "26.6.9", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { From e3931e68a1694b81640d0584a585746132ee74de Mon Sep 17 00:00:00 2001 From: Joe Cooper <33054985+cooper-joe@users.noreply.github.com> Date: Tue, 14 May 2024 11:37:48 +0200 Subject: [PATCH 19/73] fix: dimension list design (DHIS2-16270) (#1530) --- package.json | 4 +- src/__demo__/DimensionsPanel.stories.js | 1 + src/assets/DynamicDimensionIcon.js | 57 +- .../DimensionsPanel/List/DimensionItem.js | 143 +-- .../DimensionsPanel/List/OptionsButton.js | 32 +- .../DimensionsPanel/List/RecommendedIcon.js | 1 - .../__snapshots__/DimensionItem.spec.js.snap | 600 +++++------- .../List/styles/DimensionItem.style.js | 153 +-- .../List/styles/DimensionList.style.js | 10 +- .../List/styles/RecommendedIcon.style.js | 8 +- .../styles/DimensionsPanel.style.js | 2 +- yarn.lock | 871 +++++++++--------- 12 files changed, 897 insertions(+), 985 deletions(-) diff --git a/package.json b/package.json index 059a404a5..59f3b866d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/analytics", - "version": "26.6.9", + "version": "999.9.9-chip-alpha.5", "main": "./build/cjs/index.js", "module": "./build/es/index.js", "exports": { @@ -35,7 +35,7 @@ "@dhis2/cli-app-scripts": "^9.0.1", "@dhis2/cli-style": "^10.4.1", "@dhis2/d2-i18n": "^1.1.0", - "@dhis2/ui": "^9.2.0", + "@dhis2/ui": "^9.4.4", "@sambego/storybook-state": "^2.0.1", "@storybook/addons": "^6.5.16", "@storybook/preset-create-react-app": "^3.1.7", diff --git a/src/__demo__/DimensionsPanel.stories.js b/src/__demo__/DimensionsPanel.stories.js index 6a3fbc6de..71cc1abc6 100644 --- a/src/__demo__/DimensionsPanel.stories.js +++ b/src/__demo__/DimensionsPanel.stories.js @@ -94,6 +94,7 @@ storiesOf('DimensionsPanel', module).add('locked dimension', () => { dimension === DIMENSION_ID_DATA} /> ) diff --git a/src/assets/DynamicDimensionIcon.js b/src/assets/DynamicDimensionIcon.js index 83d6c678d..8fbeb84ab 100644 --- a/src/assets/DynamicDimensionIcon.js +++ b/src/assets/DynamicDimensionIcon.js @@ -3,49 +3,24 @@ import React from 'react' const DynamicDimensionIcon = () => { return ( - - - - - - - - - - - - - + + ) } diff --git a/src/components/DimensionsPanel/List/DimensionItem.js b/src/components/DimensionsPanel/List/DimensionItem.js index 7b3bd648b..8f9e09933 100644 --- a/src/components/DimensionsPanel/List/DimensionItem.js +++ b/src/components/DimensionsPanel/List/DimensionItem.js @@ -1,4 +1,5 @@ -import { IconLock16 } from '@dhis2/ui' +import { CssVariables } from '@dhis2/ui' +import cx from 'classnames' import PropTypes from 'prop-types' import React, { Component, createRef } from 'react' import DynamicDimensionIcon from '../../../assets/DynamicDimensionIcon.js' @@ -8,7 +9,7 @@ import { } from '../../../modules/predefinedDimensions.js' import OptionsButton from './OptionsButton.js' import RecommendedIcon from './RecommendedIcon.js' -import { styles } from './styles/DimensionItem.style.js' +import styles from './styles/DimensionItem.style.js' class DimensionItem extends Component { state = { mouseOver: false } @@ -27,26 +28,16 @@ class DimensionItem extends Component { getDimensionIcon = () => { const Icon = getPredefinedDimensionProp(this.props.id, 'icon') return Icon ? ( - + ) : ( - + ) } getDimensionType = () => { - const { id, name, isDeactivated } = this.props + const { id, name } = this.props - return ( - - {name} - - ) + return {name} } render() { @@ -59,20 +50,37 @@ class DimensionItem extends Component { onClick, onOptionsClick, innerRef, - style, dataTest, + className, ...rest } = this.props const Icon = this.getDimensionIcon() const Label = this.getDimensionType() - const itemStyle = - isSelected && !isDeactivated - ? { ...styles.item, ...styles.selected } - : styles.item const optionsRef = createRef() + const LockIcon = ( + <> +
+ + + +
+ + + ) + const onLabelClick = () => { if ( !isDeactivated && @@ -83,55 +91,58 @@ class DimensionItem extends Component { } return ( -
  • -
    -
    {Icon}
    -
    - {Label} - -
    - {isLocked && ( -
    - -
    + <> + +
  • - {onOptionsClick ? ( + data-test={dataTest} + onClick={onLabelClick} + {...rest} + >
    - {this.state.mouseOver && !isDeactivated && !isLocked ? ( - {Icon}
    +
    + {Label} + - ) : null} +
    • - ) : null} - + {onOptionsClick && !isDeactivated && !isLocked ? ( +
    + {this.state.mouseOver ? ( + + ) : null} +
    + ) : null} + {isLocked && LockIcon} + + + ) } } @@ -140,12 +151,12 @@ DimensionItem.propTypes = { id: PropTypes.string.isRequired, isSelected: PropTypes.bool.isRequired, // XXX name: PropTypes.string.isRequired, + className: PropTypes.string, dataTest: PropTypes.string, innerRef: PropTypes.func, isDeactivated: PropTypes.bool, isLocked: PropTypes.bool, isRecommended: PropTypes.bool, - style: PropTypes.object, onClick: PropTypes.func, onOptionsClick: PropTypes.func, } diff --git a/src/components/DimensionsPanel/List/OptionsButton.js b/src/components/DimensionsPanel/List/OptionsButton.js index 0686000a2..b7200ddcf 100644 --- a/src/components/DimensionsPanel/List/OptionsButton.js +++ b/src/components/DimensionsPanel/List/OptionsButton.js @@ -2,14 +2,36 @@ import { IconMore16 } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' -const OptionsButton = ({ style, onClick }) => ( - +const OptionsButton = ({ onClick }) => ( + <> + + + ) OptionsButton.propTypes = { - style: PropTypes.object, onClick: PropTypes.func, } diff --git a/src/components/DimensionsPanel/List/RecommendedIcon.js b/src/components/DimensionsPanel/List/RecommendedIcon.js index 3a8b75dc9..12609d3a7 100644 --- a/src/components/DimensionsPanel/List/RecommendedIcon.js +++ b/src/components/DimensionsPanel/List/RecommendedIcon.js @@ -9,7 +9,6 @@ const RecommendedIcon = ({ isRecommended, dataTest }) =>
    diff --git a/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap b/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap index 1c33a04bf..f58b07faa 100644 --- a/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap +++ b/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap @@ -1,405 +1,283 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`DimensionItem matches the snapshot 1`] = ` -
  • -
    + +
  • - -
    -
    - - Period - - + +
    +
    + + + Period + + + +
    • -
    - + +
    diff --git a/src/components/Interpretations/common/RichTextEditor/index.js b/src/components/Interpretations/common/RichTextEditor/index.js deleted file mode 100644 index 31c0113ca..000000000 --- a/src/components/Interpretations/common/RichTextEditor/index.js +++ /dev/null @@ -1 +0,0 @@ -export { RichTextEditor } from './RichTextEditor.js' diff --git a/src/components/Interpretations/common/index.js b/src/components/Interpretations/common/index.js index 562614fb1..d3473298f 100644 --- a/src/components/Interpretations/common/index.js +++ b/src/components/Interpretations/common/index.js @@ -1,4 +1,3 @@ export * from './Interpretation/index.js' export * from './Message/index.js' -export * from './RichTextEditor/index.js' export * from './getInterpretationAccess.js' diff --git a/src/components/Interpretations/common/RichTextEditor/RichTextEditor.js b/src/components/RichText/Editor/Editor.js similarity index 78% rename from src/components/Interpretations/common/RichTextEditor/RichTextEditor.js rename to src/components/RichText/Editor/Editor.js index e8ad9216d..6fdbf558e 100644 --- a/src/components/Interpretations/common/RichTextEditor/RichTextEditor.js +++ b/src/components/RichText/Editor/Editor.js @@ -1,10 +1,9 @@ import i18n from '@dhis2/d2-i18n' -import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text' import { Button, Popover, Tooltip, - Field, + Help, IconAt24, IconFaceAdd24, IconLink24, @@ -12,9 +11,11 @@ import { IconTextItalic24, colors, } from '@dhis2/ui' +import cx from 'classnames' import PropTypes from 'prop-types' import React, { forwardRef, useRef, useEffect, useState } from 'react' -import { UserMentionWrapper } from '../UserMention/UserMentionWrapper.js' +import { UserMentionWrapper } from '../../UserMention/UserMentionWrapper.js' +import { Parser } from '../Parser/Parser.js' import { convertCtrlKey, insertMarkdown, @@ -33,22 +34,22 @@ import { toolbarClasses, tooltipAnchorClasses, emojisPopoverClasses, -} from './styles/RichTextEditor.style.js' +} from './styles/Editor.style.js' const EmojisPopover = ({ onInsertMarkdown, onClose, reference }) => (
    • onInsertMarkdown(EMOJI_SMILEY_FACE)}> - {emojis[EMOJI_SMILEY_FACE]} + {emojis[EMOJI_SMILEY_FACE]}
    • onInsertMarkdown(EMOJI_SAD_FACE)}> - {emojis[EMOJI_SAD_FACE]} + {emojis[EMOJI_SAD_FACE]}
    • onInsertMarkdown(EMOJI_THUMBS_UP)}> - {emojis[EMOJI_THUMBS_UP]} + {emojis[EMOJI_THUMBS_UP]}
    • onInsertMarkdown(EMOJI_THUMBS_DOWN)}> - {emojis[EMOJI_THUMBS_DOWN]} + {emojis[EMOJI_THUMBS_DOWN]}
    @@ -190,29 +191,59 @@ Toolbar.propTypes = { disabled: PropTypes.bool, } -export const RichTextEditor = forwardRef( +export const Editor = forwardRef( ( - { value, disabled, inputPlaceholder, onChange, errorText, helpText }, + { + value, + disabled, + inputPlaceholder, + onChange, + errorText, + helpText, + initialFocus, + resizable, + }, externalRef ) => { const [previewMode, setPreviewMode] = useState(false) const internalRef = useRef() const textareaRef = externalRef || internalRef + const caretPosRef = useRef(undefined) - useEffect(() => textareaRef.current?.focus(), [textareaRef]) + const insertMarkdownCallback = (text, caretPos) => { + caretPosRef.current = caretPos + onChange(text) + textareaRef.current.focus() + } + + useEffect(() => { + if (initialFocus) { + textareaRef.current?.focus() + } + }, [initialFocus, textareaRef]) + + useEffect(() => { + if (caretPosRef.current) { + textareaRef.current?.setSelectionRange( + caretPosRef.current, + caretPosRef.current + ) + + caretPosRef.current = undefined + } + }, [value, textareaRef]) return ( -
    +
    { insertMarkdown( markdown, textareaRef.current, - (text, caretPos) => { - onChange(text) - textareaRef.current.focus() - textareaRef.current.selectionEnd = caretPos - } + insertMarkdownCallback ) if (markdown === MENTION) { @@ -231,20 +262,18 @@ export const RichTextEditor = forwardRef( /> {previewMode ? (
    - {value} + {value}
    ) : ( - +