8000 Merge pull request #3444 from DMPRoadmap/issue_3443_usage_dashboard_b… · DMPRoadmap/roadmap@96a4f59 · GitHub
[go: up one dir, main page]
Skip to content

Commit 96a4f59

Browse files
benjaminfaurebenjaminfaure
authored
Merge pull request #3444 from DMPRoadmap/issue_3443_usage_dashboard_bar_chart_broken
Fix for #3443 - bar chart click function broken in usage dashboard
2 parents 0f263f7 + 10852d4 commit 96a4f59

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v4.2.1
4+
5+
### Fixed
6+
- Fixed bar chart click function in the Usage dashboard (GitHub issue #3443)
37
## v4.2.0
48

59
**Note this upgrade is mainly a migration from Bootstrap 3 to Bootstrap 5.**

‎app/javascript/src/usage/index.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ $(() => {
4242
const usersData = JSON.parse($('#users_joined').val());
4343
if (isObject(usersData)) {
4444
const chart = createChart('#yearly_users', usersData, '', (event) => {
45-
const segment = chart.getElementAtEvent(event)[0];
45+
const points = chart.getElementsAtEventForMode(event, 'nearest', { intersect: true }, true);
46+
const segment = points[0];
4647
if (!isUndefined(segment)) {
4748
const target = $('#users_click_target').val();
48-
/* eslint-disable no-underscore-dangle, no-restricted-globals */
49-
const label = chart.data.labels[segment._index];
49+
/* eslint-disable no-restricted-globals */
50+
const label = chart.data.labels[segment.index];
5051
$(location).attr('href', `${target}?${labelToUrl(label)}`);
51-
/* eslint-enable no-underscore-dangle, no-restricted-globals */
52+
/* eslint-enable no-restricted-globals */
5253
}
5354
});
5455
}
@@ -59,13 +60,14 @@ $(() => {
5960
const plansData = JSON.parse($('#plans_created').val());
6061
if (isObject(plansData)) {
6162
const chart = createChart('#yearly_plans', plansData, '', (event) => {
62-
const segment = chart.getElementAtEvent(event)[0];
63+
const points = chart.getElementsAtEventForMode(event, 'nearest', { intersect: true }, true);
64+
const segment = points[0];
6365
if (!isUndefined(segment)) {
6466
const target = $('#plans_click_target').val();
65-
/* eslint-disable no-underscore-dangle, no-restricted-globals */
66-
const label = chart.data.labels[segment._index];
67+
/* eslint-disable no-restricted-globals */
68+
const label = chart.data.labels[segment.index];
6769
$(location).attr('href', `${target}?${labelToUrl(label)}`);
68-
/* eslint-enable no-underscore-dangle, no-restricted-globals */
70+
/* eslint-enable no-restricted-globals */
6971
}
7072
});
7173
}

0 commit comments

Comments
 (0)
0