Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Event chart updates #213

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Event chart updates #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9895507
Event chart feedbacks
balaji-jr Mar 13, 2024
26c5dd7
rm console st
balaji-jr Mar 13, 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
22 changes: 8 additions & 14 deletions src/pages/Logs/EventTimeLineGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useQueryResult } from '@/hooks/useQueryResult';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { useLogsPageContext } from './logsContextProvider';
import dayjs, { Dayjs } from 'dayjs';
import { BarChart, ChartTooltipProps } from '@mantine/charts';
import { ChartTooltipProps, AreaChart } from '@mantine/charts';
import { HumanizeNumber } from '@/utils/formatBytes';
import { useHeaderContext } from '@/layouts/MainLayout/Context';

Expand Down Expand Up @@ -32,6 +32,7 @@ type GraphRecord = {

const calcAverage = (data: GraphRecord[]) => {
if (!Array.isArray(data) || data.length === 0) return 0;

const total = data.reduce((acc, d) => {
return acc + d.log_count;
}, 0);
Expand Down Expand Up @@ -59,8 +60,6 @@ const parseGraphData = (data: GraphRecord[], avg: number, startTime: Dayjs) => {
if (!countData || typeof countData !== 'object') {
return {
events: 0,
belowAvgCount: 0,
aboveAvgCount: 0,
minute: ts,
aboveAvgPercent: 0,
};
Expand All @@ -69,8 +68,6 @@ const parseGraphData = (data: GraphRecord[], avg: number, startTime: Dayjs) => {
const aboveAvgPercent = parseInt(((aboveAvgCount / avg) * 100).toFixed(2));
return {
events: countData.log_count,
belowAvgCount: aboveAvgCount >= 0 ? avg : countData.log_count,
aboveAvgCount: aboveAvgCount <= 0 ? 0 : aboveAvgCount,
minute: `${countData.minute_range}Z`,
aboveAvgPercent,
};
Expand Down Expand Up @@ -103,7 +100,7 @@ function ChartTooltip({ payload }: ChartTooltipProps) {
<Stack mt={4} style={{ flexDirection: 'row', justifyContent: 'center' }}>
<Text size="sm" c={isAboveAvg ? 'red.6' : 'green.8'}>{`${
isAboveAvg ? '+' : ''
}${aboveAvgPercent}% above avg (Last 30 mins)`}</Text>
}${aboveAvgPercent}% ${isAboveAvg ? 'above' : 'below'} avg (Last 30 mins)`}</Text>
</Stack>
</Paper>
);
Expand Down Expand Up @@ -177,27 +174,24 @@ const EventTimeLineGraph = () => {
w={isLoading ? '98%' : '100%'}
style={isLoading ? { marginLeft: '1.8rem', alignSelf: 'center' } : !hasData ? { marginLeft: '1rem' } : {}}>
{hasData ? (
<BarChart
<AreaChart
h="100%"
data={graphData}
dataKey="minute"
series={[
{ name: 'belowAvgCount', color: 'indigo.6', label: 'Events' },
{ name: 'aboveAvgCount', color: 'red.6', label: 'Events' },
]}
series={[{ name: 'events', color: 'indigo.5', label: 'Events' }]}
tooltipProps={{
content: ({ label, payload }) => <ChartTooltip label={label} payload={payload} />,
position: { y: -20 },
}}
type="stacked"
valueFormatter={(value) => new Intl.NumberFormat('en-US').format(value)}
withXAxis={false}
withYAxis={hasData}
yAxisProps={{ tickCount: 2, tickFormatter: (value) => `${HumanizeNumber(value)}` }}
referenceLines={[{ y: avgEventCount, color: 'red.5' }]}
referenceLines={[{ y: avgEventCount, color: 'red.6', label: 'Avg' }]}
tickLine="none"
barChartProps={{ onClick: setTimeRange }}
areaChartProps={{ onClick: setTimeRange, style: { cursor: 'pointer' }}}
gridAxis="xy"
fillOpacity={0.5}
/>
) : (
<NoDataView />
Expand Down