🐛 fix: Rename 'server_id' to 'protocol' in NodesPage and clean up unused imports and code in ServerConfig

This commit is contained in:
web 2025-09-23 06:08:36 -07:00
parent 3c036eb09c
commit 70b3484f98
2 changed files with 7 additions and 128 deletions

View File

@ -98,7 +98,7 @@ export default function NodesPage() {
`${getServerName(row.original.server_id)}:${getServerAddress(row.original.server_id)}`, `${getServerName(row.original.server_id)}:${getServerAddress(row.original.server_id)}`,
}, },
{ {
id: 'server_id', id: 'protocol',
header: ` ${t('protocol')}:${t('port')}`, header: ` ${t('protocol')}:${t('port')}`,
cell: ({ row }) => cell: ({ row }) =>
`${row.original.protocol}:${getProtocolPort(row.original.server_id, row.original.protocol)}`, `${row.original.protocol}:${getProtocolPort(row.original.server_id, row.original.protocol)}`,

View File

@ -9,7 +9,7 @@ import {
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useQuery } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { Button } from '@workspace/ui/components/button'; import { Button } from '@workspace/ui/components/button';
import { ChartContainer, ChartTooltip } from '@workspace/ui/components/chart';
import { import {
Form, Form,
FormControl, FormControl,
@ -35,65 +35,11 @@ import { Icon } from '@workspace/ui/custom-components/icon';
import { DicesIcon } from 'lucide-react'; import { DicesIcon } from 'lucide-react';
import { useTranslations } from 'next-intl'; import { useTranslations } from 'next-intl';
import { uid } from 'radash'; import { uid } from 'radash';
import { useEffect, useMemo, useState } from 'react'; import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { Cell, Legend, Pie, PieChart } from 'recharts';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { z } from 'zod'; import { z } from 'zod';
const COLORS = [
'hsl(var(--chart-1))',
'hsl(var(--chart-2))',
'hsl(var(--chart-3))',
'hsl(var(--chart-4))',
'hsl(var(--chart-5))',
];
const MINUTES_IN_DAY = 1440;
function getTimeRangeData(slots: API.TimePeriod[]) {
const timePoints = slots
.filter((slot) => slot.start_time && slot.end_time)
.flatMap((slot) => {
const [startH = 0, startM = 0] = slot.start_time.split(':').map(Number);
const [endH = 0, endM = 0] = slot.end_time.split(':').map(Number);
const start = startH * 60 + startM;
let end = endH * 60 + endM;
if (end < start) end += MINUTES_IN_DAY;
return { start, end, multiplier: slot.multiplier };
})
.sort((a, b) => a.start - b.start);
const result: { name: string; value: number; multiplier: number }[] = [];
let currentMinute = 0;
timePoints.forEach((point) => {
if (point.start > currentMinute) {
result.push({
name: `${Math.floor(currentMinute / 60)}:${String(currentMinute % 60).padStart(2, '0')} - ${Math.floor(point.start / 60)}:${String(point.start % 60).padStart(2, '0')}`,
value: point.start - currentMinute,
multiplier: 1,
});
}
result.push({
name: `${Math.floor(point.start / 60)}:${String(point.start % 60).padStart(2, '0')} - ${Math.floor((point.end / 60) % 24)}:${String(point.end % 60).padStart(2, '0')}`,
value: point.end - point.start,
multiplier: point.multiplier,
});
currentMinute = point.end % MINUTES_IN_DAY;
});
if (currentMinute < MINUTES_IN_DAY) {
result.push({
name: `${Math.floor(currentMinute / 60)}:${String(currentMinute % 60).padStart(2, '0')} - 24:00`,
value: MINUTES_IN_DAY - currentMinute,
multiplier: 1,
});
}
return result;
}
const nodeConfigSchema = z.object({ const nodeConfigSchema = z.object({
node_secret: z.string().optional(), node_secret: z.string().optional(),
node_pull_interval: z.number().optional(), node_pull_interval: z.number().optional(),
@ -150,20 +96,6 @@ export default function ServerConfig() {
} }
}, [periodsResp]); }, [periodsResp]);
const chartTimeSlots = useMemo(() => getTimeRangeData(timeSlots), [timeSlots]);
const chartConfig = useMemo(() => {
return chartTimeSlots.reduce(
(acc, item, index) => {
acc[item.name] = {
label: item.name,
color: COLORS[index % COLORS.length] || 'hsl(var(--default-chart-color))',
};
return acc;
},
{} as Record<string, { label: string; color: string }>,
);
}, [chartTimeSlots]);
async function onSubmit(values: NodeConfigFormData) { async function onSubmit(values: NodeConfigFormData) {
setSaving(true); setSaving(true);
try { try {
@ -293,8 +225,8 @@ export default function ServerConfig() {
{t('config.dynamicMultiplierDescription')} {t('config.dynamicMultiplierDescription')}
</p> </p>
<div className='flex flex-col-reverse gap-2 md:flex-row md:items-start'> <div className='flex flex-col gap-2'>
<div className='w-full md:w-1/2'> <div className='w-full'>
<ArrayInput<API.TimePeriod> <ArrayInput<API.TimePeriod>
fields={[ fields={[
{ name: 'start_time', prefix: t('config.startTime'), type: 'time' }, { name: 'start_time', prefix: t('config.startTime'), type: 'time' },
@ -311,71 +243,18 @@ export default function ServerConfig() {
/> />
<div className='mt-3 flex gap-2'> <div className='mt-3 flex gap-2'>
<Button <Button
type='button'
size='sm' size='sm'
variant='outline' variant='outline'
onClick={() => setTimeSlots(periodsResp || [])} onClick={() => setTimeSlots(periodsResp || [])}
> >
{t('config.reset')} {t('config.reset')}
</Button> </Button>
<Button size='sm' onClick={savePeriods}> <Button size='sm' type='button' onClick={savePeriods}>
{t('config.save')} {t('config.save')}
</Button> </Button>
</div> </div>
</div> </div>
<div className='w-full md:w-1/2'>
<ChartContainer config={chartConfig} className='mx-auto aspect-[5/3] w-full'>
<PieChart>
<Pie
data={chartTimeSlots}
cx='50%'
cy='50%'
labelLine={false}
outerRadius='80%'
fill='#8884d8'
dataKey='value'
label={({ percent, multiplier }) =>
`${(multiplier || 0)?.toFixed(2)}x (${(percent * 100).toFixed(0)}%)`
}
>
{chartTimeSlots.map((entry, index) => (
<Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
))}
</Pie>
<ChartTooltip
content={({ payload }) => {
if (payload && payload.length) {
const d = payload[0]?.payload as any;
return (
<div className='bg-background rounded-lg border p-2 shadow-sm'>
<div className='grid grid-cols-2 gap-2'>
<div className='flex flex-col'>
<span className='text-muted-foreground text-[0.70rem] uppercase'>
{t('config.timeSlot')}
</span>
<span className='text-muted-foreground font-bold'>
{d.name || '—'}
</span>
</div>
<div className='flex flex-col'>
<span className='text-muted-foreground text-[0.70rem] uppercase'>
{t('config.multiplier')}
</span>
<span className='font-bold'>
{Number(d.multiplier).toFixed(2)}x
</span>
</div>
</div>
</div>
);
}
return null;
}}
/>
<Legend />
</PieChart>
</ChartContainer>
</div>
</div> </div>
</div> </div>
</form> </form>