Merge branch 'master' into feat/rich-text-user-mention-components

dhis2 · May 15, 2024 · 57fe99b · 57fe99b
2 parents 6946377 + ef1f0c9
commit 57fe99b
Show file tree

Hide file tree

Showing 16 changed files with 1,004 additions and 1,051 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## [26.6.10](https://github.com/dhis2/analytics/compare/v26.6.9...v26.6.10) (2024-05-14)
+
+
+### Bug Fixes
+
+* dimension list design (DHIS2-16270) ([#1530](https://github.com/dhis2/analytics/issues/1530)) ([e3931e6](https://github.com/dhis2/analytics/commit/e3931e68a1694b81640d0584a585746132ee74de))
+
+## [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)
+
+
+### 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)
+
+
+### 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/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 "ລົບອອກ"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.6.6",
+    "version": "26.6.10",
     "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
@@ -94,6 +94,7 @@ storiesOf('DimensionsPanel', module).add('locked dimension', () => {
         <DimensionsPanel
             dimensions={[...fixedDimensions, ...dynamicDimensions]}
             onDimensionClick={onDimensionClick}
+            selectedIds={[DIMENSION_ID_DATA]}
             lockedDimension={(dimension) => dimension === DIMENSION_ID_DATA}
         />
     )

diff --git a/src/assets/DynamicDimensionIcon.js b/src/assets/DynamicDimensionIcon.js
@@ -3,49 +3,24 @@ import React from 'react'
 const DynamicDimensionIcon = () => {
     return (
         <svg
-            width="16px"
-            height="16px"
-            viewBox="0 0 16 16"
-            version="1.1"
+            width="16"
+            height="16"
+            fill="none"
             xmlns="http://www.w3.org/2000/svg"
         >
-            <g
-                id="Exp"
-                stroke="none"
-                strokeWidth="1"
-                fill="none"
-                fillRule="evenodd"
-            >
-                <g id="Artboard" transform="translate(-80.000000, -9.000000)">
-                    <g
-                        id="icon_dimension_new"
-                        transform="translate(80.000000, 9.000000)"
-                    >
-                        <rect id="frame" x="0" y="0" width="16" height="16" />
-                        <g
-                            id="module"
-                            transform="translate(4.000000, 4.000000)"
-                            stroke="#000000"
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                        >
-                            <path
-                                d="M0.33209728,1.1742111 L3.16308174,0.0641666694 C3.37911767,-0.0213888898 3.61963794,-0.0213888898 3.83567387,0.0641666694 L6.66665833,1.1742111 C6.87300668,1.26220739 7.00497003,1.467 6.99984343,1.69127776 L6.99984343,5.30887771 C7.00517859,5.53285411 6.87376309,5.73756106 6.66790272,5.82594437 L3.83691826,6.93629991 C3.62076407,7.02123336 3.38048032,7.02123336 3.16432613,6.93629991 L0.333341668,5.82594437 C0.126993317,5.73794808 -0.00497002591,5.53315547 0.000156574133,5.30887771 L0.000156574133,1.69127776 C-0.00517858533,1.46730136 0.126236906,1.26259441 0.33209728,1.1742111 Z"
-                                id="Shape"
-                            />
-                            <path
-                                d="M3.5,2.72795833 L0.322,1.48195833"
-                                id="Shape"
-                            />
-                            <path
-                                d="M3.5,2.72795833 L6.678,1.48195833"
-                                id="Shape"
-                            />
-                            <path d="M3.5,6.78125 L3.5,2.72795833" id="Shape" />
-                        </g>
-                    </g>
-                </g>
-            </g>
+            <path
+                clipRule="evenodd"
+                d="m4.832 5.674 2.831-1.11a.913.913 0 0 1 .673 0l2.83 1.11a.548.548 0 0 1 .334.517V9.81a.548.548 0 0 1-.332.517l-2.831 1.11a.92.92 0 0 1-.673 0l-2.83-1.11a.548.548 0 0 1-.334-.517V6.19a.548.548 0 0 1 .332-.517Z"
+                stroke="#212934"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+            />
+            <path
+                d="M8 7.228 4.822 5.982M8 7.228l3.178-1.246M8 11.281V7.228"
+                stroke="#212934"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+            />
         </svg>
     )
 }