update charts to use fixed time for x axis

This commit is contained in:
Henry Dollman
2024-07-16 16:40:37 -04:00
parent cdb069e633
commit 4f3796e9bc
7 changed files with 141 additions and 59 deletions

View File

@@ -6,15 +6,21 @@ import {
ChartTooltip,
ChartTooltipContent,
} from '@/components/ui/chart'
import { formatShortDate, formatShortTime } from '@/lib/utils'
import { calculateXaxisTicks, formatShortDate, formatShortTime } from '@/lib/utils'
import { useMemo } from 'react'
import Spinner from '../spinner'
export default function ({
export default function MemChart({
chartData,
}: {
chartData: { time: string; mem: number; memUsed: number; memCache: number }[]
chartData: { time: number; mem: number; memUsed: number; memCache: number }[]
}) {
if (!chartData.length) {
return <Spinner />
}
const ticks = useMemo(() => calculateXaxisTicks(chartData), [chartData])
const totalMem = useMemo(() => {
return Math.ceil(chartData[0]?.mem)
}, [chartData])
@@ -33,10 +39,6 @@ export default function ({
[]
) satisfies ChartConfig
if (!chartData.length) {
return <Spinner />
}
return (
<ChartContainer config={chartConfig} className="h-full w-full absolute aspect-auto">
<AreaChart
@@ -59,6 +61,10 @@ export default function ({
{/* todo: short time if first date is same day, otherwise short date */}
<XAxis
dataKey="time"
domain={[ticks[0], ticks.at(-1)!]}
ticks={ticks}
type="number"
scale={'time'}
tickLine={true}
axisLine={false}
tickMargin={8}
@@ -66,13 +72,15 @@ export default function ({
tickFormatter={formatShortTime}
/>
<ChartTooltip
cursor={false}
// cursor={false}
animationEasing="ease-out"
animationDuration={150}
content={
<ChartTooltipContent
unit="GiB"
// @ts-ignore
itemSorter={(a, b) => a.name.localeCompare(b.name)}
labelFormatter={formatShortDate}
labelFormatter={(_, data) => formatShortDate(data[0].payload.time)}
indicator="line"
/>
}