diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po index 13151c4e3..7b5fb12b5 100644 --- a/i18n/uz_UZ_Cyrl.po +++ b/i18n/uz_UZ_Cyrl.po @@ -119,6 +119,9 @@ msgstr "" msgid "View as Chart" msgstr "Диаграмма сифатида кўриш" +msgid "This map can't be displayed as a table" +msgstr "Ушбу харитани жадвал сифатида кўратиб бўлмайди" + msgid "View as Pivot table" msgstr "" diff --git a/package.json b/package.json index fd392c504..46e6517b6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^26.6.5", + "@dhis2/analytics": "^26.6.10", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", diff --git a/src/components/Item/VisualizationItem/Item.js b/src/components/Item/VisualizationItem/Item.js index 4d2a67bb1..93f30c97b 100644 --- a/src/components/Item/VisualizationItem/Item.js +++ b/src/components/Item/VisualizationItem/Item.js @@ -88,9 +88,13 @@ class Item extends Component { } async componentDidMount() { - this.props.setVisualization( - await apiFetchVisualization(this.props.item) - ) + // Avoid refetching the visualization already in the Redux store + // when the same dashboard item is added again. + // This also solves a flashing of all the "duplicated" dashboard items. + !this.props.visualization.id && + this.props.setVisualization( + await apiFetchVisualization(this.props.item) + ) try { if ( @@ -228,8 +232,9 @@ class Item extends Component { } case CHART: case VISUALIZATION: { - return item.visualization.type === - VIS_TYPE_OUTLIER_TABLE && + return item.type === VISUALIZATION && + item.visualization.type === + VIS_TYPE_OUTLIER_TABLE && Object.keys(itemFilters).some( (filter) => ![ diff --git a/src/pages/view/TitleBar/FilterDialog.js b/src/pages/view/TitleBar/FilterDialog.js index 10e15b1aa..f1586e612 100644 --- a/src/pages/view/TitleBar/FilterDialog.js +++ b/src/pages/view/TitleBar/FilterDialog.js @@ -110,6 +110,7 @@ const FilterDialog = ({ )} selected={selectedItems} onSelect={onSelectItems} + displayNameProp={userSettings.displayProperty} /> ) default: diff --git a/yarn.lock b/yarn.lock index 1ed96ddc8..aa8b14455 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2245,10 +2245,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.6.5": - version "26.6.5" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.5.tgz#44ee29a279c37f3969096d859bc0f07d953e3f42" - integrity sha512-ob6kNEEkIAC50RtKuUZWi8Y04uwsPHK/EiYhzxZkSOdS5wFm8X+88KZrD//fILXQjwMhJvl/4+F/T0qVxOF/jQ== +"@dhis2/analytics@^26.6.10": + version "26.6.10" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.10.tgz#669fab3007b609a3c1a692a8261c759198e7035f" + integrity sha512-RHBvMdAuoDpSwxcoBTSsTWlhTUy8nJbKCANbFnB3NcBjsh+XMhwFJSkCGnCKElkhWbrm9h8kZVobqv62p6W2cA== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0"