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] "Users By Time of the Day" chart displays incorrect data for Local Timezone #22836

Merged
merged 4 commits into from
Aug 5, 2021
Merged

[FIX] "Users By Time of the Day" chart displays incorrect data for Local Timezone #22836

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4ee311
Fix Local time conversion in the Users By Time of the Day chart
matheusbsilva137 Aug 2, 2021
87f7841
Merge branch 'develop' into fix/users-by-time-of-day
tassoevan Aug 3, 2021
452dadd
Merge branch 'develop' into fix/users-by-time-of-day
matheusbsilva137 Aug 5, 2021
837ef5f
Merge branch 'develop' into fix/users-by-time-of-day
matheusbsilva137 Aug 5, 2021
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
43 changes: 25 additions & 18 deletions ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ const UsersByTimeOfTheDaySection = ({ timezone }) => {
case 'last 7 days':
return {
start: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days')
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
? moment.utc().startOf('day').subtract(7, 'days')
: moment().startOf('day').subtract(8, 'days'),
end: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1)
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
? moment.utc().endOf('day').subtract(1, 'days')
: moment().endOf('day'),
};

case 'last 30 days':
return {
start: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days')
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
? moment.utc().startOf('day').subtract(30, 'days')
: moment().startOf('day').subtract(31, 'days'),
end: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1)
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
? moment.utc().endOf('day').subtract(1, 'days')
: moment().endOf('day'),
};

case 'last 90 days':
return {
start: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days')
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
? moment.utc().startOf('day').subtract(90, 'days')
: moment().startOf('day').subtract(91, 'days'),
end: utc
? moment.utc().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1)
: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
? moment.utc().endOf('day').subtract(1, 'days')
: moment().endOf('day'),
};
}
}, [periodId, utc]);
Expand All @@ -61,7 +61,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }) => {
end: period.end.toISOString(),
}), [period]);

const { value: data } = useEndpointData('engagement-dashboard/users/users-by-time-of-the-day-in-a-week', params);
const { value: data } = useEndpointData('engagement-dashboard/users/users-by-time-of-the-day-in-a-week', useMemo(() => params, [params]));

const [
dates,
Expand All @@ -71,20 +71,27 @@ const UsersByTimeOfTheDaySection = ({ timezone }) => {
return [];
}

const dates = Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 },
(_, i) => moment(period.start).add(i, 'days'));
const dates = Array.from({ length: utc
? moment(period.end).diff(period.start, 'days') + 1
: moment(period.end).diff(period.start, 'days') - 1 },
(_, i) => moment(period.start).endOf('day').add(utc ? i : i + 1, 'days'));

const values = Array.from({ length: 24 }, (_, hour) => ({
hour: String(hour),
...dates.map((date) => ({ [date.toISOString()]: 0 }))
.reduce((obj, elem) => ({ ...obj, ...elem }), {}),
}));

const timezoneOffset = moment().utcOffset() / 60;

for (const { users, hour, day, month, year } of data.week) {
const date = utc
? moment.utc([year, month - 1, day, 0, 0, 0, 0]).toISOString()
: moment([year, month - 1, day, 0, 0, 0, 0]).toISOString();
values[hour][date] += users;
? moment.utc([year, month - 1, day, hour])
: moment([year, month - 1, day, hour]).add(timezoneOffset, 'hours');

if (utc || (!date.isSame(period.end) && !date.clone().startOf('day').isSame(period.start))) {
values[date.hour()][date.endOf('day').toISOString()] += users;
}
}

return [
Expand Down