Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: merge to master #2969

Merged
merged 4 commits into from
May 16, 2024
Merged

fix: merge to master #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd67fc6
fix: avoid re-rendering an item when adding the same again (DHIS2-170…
edoardo Apr 26, 2024
a4e5340
fix: avoid reading from undefined error (DHIS2-17334) (#2970)
edoardo May 8, 2024
928b88a
fix: system / user setting for display name not respected in Org Unit…
martinkrulltott May 13, 2024
790afd2
fix: dimension list design (DHIS2-16270) (#2861)
martinkrulltott May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions i18n/uz_UZ_Cyrl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 10 additions & 5 deletions src/components/Item/VisualizationItem/Item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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) =>
![
Expand Down
1 change: 1 addition & 0 deletions src/pages/view/TitleBar/FilterDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ const FilterDialog = ({
)}
selected={selectedItems}
onSelect={onSelectItems}
displayNameProp={userSettings.displayProperty}
/>
)
default:
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading