Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/rude-spoons-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed Engagement Dashboard timezone selector freezing UI
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ResponsiveHeatMap } from '@nivo/heatmap';
import { ResponsiveHeatMapCanvas } from '@nivo/heatmap';
import { Box, Flex, Skeleton, Tooltip } from '@rocket.chat/fuselage';
import colors from '@rocket.chat/fuselage-tokens/colors.json';
import { useTranslation } from '@rocket.chat/ui-contexts';
import moment from 'moment';
import type { ReactElement } from 'react';
import React, { useMemo } from 'react';
import React, { useCallback, useMemo } from 'react';

import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
Expand All @@ -21,59 +21,48 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp

const utc = timezone === 'utc';

const { data } = useUsersByTimeOfTheDay({ period, utc });
const { data, isLoading } = useUsersByTimeOfTheDay({ period, utc });

const t = useTranslation();

const [dates, values] = useMemo(() => {
if (!data) {
if (!data || isLoading) {
return [];
}

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

const values = Array.from(
{ length: 24 },
(
_,
hour,
): {
id: string;
data: {
x: string;
y: number;
}[];
} => ({
id: String(hour),
data: dates.map((date) => ({ x: date.toISOString(), y: 0 })),
}),
);
const length = utc ? moment(data.end).diff(data.start, 'days') + 1 : moment(data.end).diff(data.start, 'days') - 1;
const start = utc ? moment.utc(data.start).endOf('day') : moment(data.start).endOf('day').add(1, 'days');

const dates = new Array(length);
for (let i = 0; i < length; i++) {
dates[i] = start.clone().add(i, 'days').toISOString();
}

const values = new Array(24);
for (let hour = 0; hour < 24; hour++) {
values[hour] = {
id: hour.toString(),
data: dates.map((x) => ({ x, y: 0 })),
};
}

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

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

if (utc || (!date.isSame(data.end) && !date.clone().startOf('day').isSame(data.start))) {
const dataPoint = values[date.hour()].data.find((point) => point.x === date.endOf('day').toISOString());
const dataPoint = values[date.hour()].data.find((point: { x: string }) => point.x === date.endOf('day').toISOString());
if (dataPoint) {
dataPoint.y += users;
}
}
}

return [dates.map((date) => date.toISOString()), values];
}, [data, utc]);
return [dates, values];
}, [data, isLoading, utc]);

const tooltip = useCallback(({ cell }): ReactElement => <Tooltip>{t('Value_users', { value: cell.data.y })}</Tooltip>, [t]);

return (
<>
Expand All @@ -95,7 +84,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
/>
</EngagementDashboardCardFilter>

{values ? (
{!isLoading && values && dates ? (
<Box display='flex' style={{ height: 696 }}>
<Flex.Item align='stretch' grow={1} shrink={0}>
<Box style={{ position: 'relative' }}>
Expand All @@ -106,7 +95,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
height: '100%',
}}
>
<ResponsiveHeatMap
<ResponsiveHeatMapCanvas
data={values}
xInnerPadding={0.1}
yInnerPadding={0.25}
Expand Down Expand Up @@ -176,7 +165,7 @@ const UsersByTimeOfTheDaySection = ({ timezone }: UsersByTimeOfTheDaySectionProp
},
},
}}
tooltip={({ cell }): ReactElement => <Tooltip>{t('Value_users', { value: cell.data.y })}</Tooltip>}
tooltip={tooltip}
/>
</Box>
</Box>
Expand Down
10 changes: 5 additions & 5 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@
"@bugsnag/plugin-react": "~7.19.0",
"@google-cloud/storage": "^6.11.0",
"@kaciras/deasync": "^1.0.3",
"@nivo/bar": "0.80.0",
"@nivo/core": "0.80.0",
"@nivo/heatmap": "0.80.0",
"@nivo/line": "0.80.0",
"@nivo/pie": "0.80.0",
"@nivo/bar": "0.84.0",
"@nivo/core": "0.84.0",
"@nivo/heatmap": "0.84.0",
"@nivo/line": "0.84.0",
"@nivo/pie": "0.84.0",
"@react-aria/color": "^3.0.0-beta.15",
"@react-pdf/renderer": "^3.1.14",
"@rocket.chat/account-utils": "workspace:^",
Expand Down
Loading