Merge branch 'master' into feat/DHIS2-15796

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [26.10.0](https://github.com/dhis2/analytics/compare/v26.9.6...v26.10.0) (2025-01-09)
+
+
+### Features
+
+* display type and definitions in data item selector (DHIS2-14774) ([#1713](https://github.com/dhis2/analytics/issues/1713)) ([27f4b65](https://github.com/dhis2/analytics/commit/27f4b6533688586313fd7a8918c532205acc2c48))
+
 ## [26.9.6](https://github.com/dhis2/analytics/compare/v26.9.5...v26.9.6) (2024-12-22)
 
 

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: 2024-10-11T12:49:26.846Z\n"
-"PO-Revision-Date: 2024-10-11T12:49:26.847Z\n"
+"POT-Creation-Date: 2024-12-19T10:28:15.132Z\n"
+"PO-Revision-Date: 2024-12-19T10:28:15.132Z\n"
 
 msgid "view only"
 msgstr "view only"
@@ -168,6 +168,150 @@ msgstr "Disaggregation"
 msgid "No data"
 msgstr "No data"
 
+msgid "Expression description"
+msgstr "Expression description"
+
+msgid "Error loading value"
+msgstr "Error loading value"
+
+msgid "None"
+msgstr "None"
+
+msgid "Data set(s)"
+msgstr "Data set(s)"
+
+msgid "Zero is significant"
+msgstr "Zero is significant"
+
+msgid "True"
+msgstr "True"
+
+msgid "False"
+msgstr "False"
+
+msgid "Value type"
+msgstr "Value type"
+
+msgid "Aggregation type"
+msgstr "Aggregation type"
+
+msgid "Category combo"
+msgstr "Category combo"
+
+msgid "Option set"
+msgstr "Option set"
+
+msgid "Group membership"
+msgstr "Group membership"
+
+msgid "Legend set(s)"
+msgstr "Legend set(s)"
+
+msgid "Category option name"
+msgstr "Category option name"
+
+msgid "Category combo name"
+msgstr "Category combo name"
+
+msgid "Categories name"
+msgstr "Categories name"
+
+msgid "Period type"
+msgstr "Period type"
+
+msgid "Indicators"
+msgstr "Indicators"
+
+msgid "Expiry days"
+msgstr "Expiry days"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Data element"
+msgstr "Data element"
+
+msgid "Tracked entity attribute"
+msgstr "Tracked entity attribute"
+
+msgid "Numerator description"
+msgstr "Numerator description"
+
+msgid "Numerator expression"
+msgstr "Numerator expression"
+
+msgid "Denominator description"
+msgstr "Denominator description"
+
+msgid "Denominator expression"
+msgstr "Denominator expression"
+
+msgid "Annualized"
+msgstr "Annualized"
+
+msgid "Yes"
+msgstr "Yes"
+
+msgid "No"
+msgstr "No"
+
+msgid "Indicator type"
+msgstr "Indicator type"
+
+msgid "Decimals in output"
+msgstr "Decimals in output"
+
+msgid "There was a problem loading information for this data item."
+msgstr "There was a problem loading information for this data item."
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Code"
+msgstr "Code"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "Last updated date"
+msgstr "Last updated date"
+
+msgid "Created date"
+msgstr "Created date"
+
+msgid "Created by"
+msgstr "Created by"
+
+msgid "Custom"
+msgstr "Custom"
+
+msgid "Program"
+msgstr "Program"
+
+msgid "Analytics type"
+msgstr "Analytics type"
+
+msgid "Enrollment"
+msgstr "Enrollment"
+
+msgid "Event"
+msgstr "Event"
+
+msgid "Analytics period boundaries"
+msgstr "Analytics period boundaries"
+
+msgid "{{ offsetPeriodType }} × {{ offsetPeriods }}"
+msgstr "{{ offsetPeriodType }} × {{ offsetPeriods }}"
+
+msgid "Expression"
+msgstr "Expression"
+
+msgid "Filter"
+msgstr "Filter"
+
 msgid "Search by data item name"
 msgstr "Search by data item name"
 
@@ -322,12 +466,6 @@ msgstr "Close"
 msgid "Rename {{fileType}}"
 msgstr "Rename {{fileType}}"
 
-msgid "Name"
-msgstr "Name"
-
-msgid "Description"
-msgstr "Description"
-
 msgid "Rename"
 msgstr "Rename"
 
@@ -436,9 +574,6 @@ msgstr "Enter interpretation text"
 msgid "Not available offline"
 msgstr "Not available offline"
 
-msgid "Created by"
-msgstr "Created by"
-
 msgid "Anyone"
 msgstr "Anyone"
 
@@ -460,9 +595,6 @@ msgstr "Created"
 msgid "Last updated"
 msgstr "Last updated"
 
-msgid "Type"
-msgstr "Type"
-
 msgid "Clear filters"
 msgstr "Clear filters"
 
@@ -627,9 +759,6 @@ msgstr "Select a group"
 msgid "Deselect all"
 msgstr "Deselect all"
 
-msgid "Period type"
-msgstr "Period type"
-
 msgid "Year"
 msgstr "Year"
 
@@ -927,9 +1056,6 @@ msgstr "Series"
 msgid "Category"
 msgstr "Category"
 
-msgid "Filter"
-msgstr "Filter"
-
 msgid "Columns"
 msgstr "Columns"
 
@@ -954,15 +1080,9 @@ msgstr "Actual reports on time"
 msgid "Expected reports"
 msgstr "Expected reports"
 
-msgid "Program"
-msgstr "Program"
-
 msgid "Select a program"
 msgstr "Select a program"
 
-msgid "Indicators"
-msgstr "Indicators"
-
 msgid "Indicator group"
 msgstr "Indicator group"
 
@@ -981,9 +1101,6 @@ msgstr "Loading indicator groups"
 msgid "Data element group"
 msgstr "Data element group"
 
-msgid "Data element"
-msgstr "Data element"
-
 msgid "No data element groups found"
 msgstr "No data element groups found"
 
@@ -1140,6 +1257,81 @@ msgstr "Organisation unit"
 msgid "Assigned Categories"
 msgstr "Assigned Categories"
 
+msgid "Text"
+msgstr "Text"
+
+msgid "Long text"
+msgstr "Long text"
+
+msgid "Multi text"
+msgstr "Multi text"
+
+msgid "Letter"
+msgstr "Letter"
+
+msgid "Phone number"
+msgstr "Phone number"
+
+msgid "Email"
+msgstr "Email"
+
+msgid "Yes/No"
+msgstr "Yes/No"
+
+msgid "Yes Only"
+msgstr "Yes Only"
+
+msgid "Date"
+msgstr "Date"
+
+msgid "Date & Time"
+msgstr "Date & Time"
+
+msgid "Time"
+msgstr "Time"
+
+msgid "Unit interval"
+msgstr "Unit interval"
+
+msgid "Percentage"
+msgstr "Percentage"
+
+msgid "Integer"
+msgstr "Integer"
+
+msgid "Positive Integer"
+msgstr "Positive Integer"
+
+msgid "Negative Integer"
+msgstr "Negative Integer"
+
+msgid "Positive or Zero Integer"
+msgstr "Positive or Zero Integer"
+
+msgid "Tracker Associate"
+msgstr "Tracker Associate"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Coordinate"
+msgstr "Coordinate"
+
+msgid "Reference"
+msgstr "Reference"
+
+msgid "Age"
+msgstr "Age"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Image"
+msgstr "Image"
+
+msgid "GeoJSON"
+msgstr "GeoJSON"
+
 msgid "Pivot table"
 msgstr "Pivot table"
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.9.6",
+    "version": "26.10.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -30,11 +30,11 @@
         "validate-push": "yarn test"
     },
     "devDependencies": {
-        "@dhis2/app-runtime": "^3.9.0",
+        "@dhis2/app-runtime": "^3.11.3",
         "@dhis2/cli-app-scripts": "^11.7.4",
         "@dhis2/cli-style": "^10.7.4",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^9.4.4",
+        "@dhis2/ui": "^10.1.9",
         "@mihkeleidast/storybook-addon-source": "^1.0.1",
         "@storybook/preset-create-react-app": "^8.3.6",
         "@storybook/react": "^8.3.6",
@@ -52,7 +52,7 @@
     "peerDependencies": {
         "@dhis2/app-runtime": "^3",
         "@dhis2/d2-i18n": "^1.1",
-        "@dhis2/ui": "^9.2.0",
+        "@dhis2/ui": "^10",
         "prop-types": "^15",
         "react": "^16.3",
         "react-dom": "^16.3",
@@ -76,7 +76,7 @@
         "resize-observer-polyfill": "^1.5.1"
     },
     "resolutions": {
-        "@dhis2/ui": "^9.2.0",
+        "@dhis2/ui": "^10.1.9",
         "eslint": "^7.32.0"
     },
     "files": [