S-VPN/panel-web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix(dashboard): Correct progress value calculations and update groupId accessor

Browse Source
This commit is contained in:
web@ppanel 2025-01-08 00:43:32 +07:00
parent 5766376590
commit 36c76674b6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/admin/app/dashboard/server/node-status.tsx
View File

@ -54,21 +54,21 @@ export function NodeStatusCell({ status }: { status: API.NodeStatus }) {
<span>CPU</span> <span>CPU</span>
<span>{formatPercentage(serverStatus?.cpu ?? 0)}</span> <span>{formatPercentage(serverStatus?.cpu ?? 0)}</span>
</div> </div>
<Progress value={(serverStatus?.cpu ?? 0) * 100} className='h-2' max={100} /> <Progress value={serverStatus?.cpu ?? 0} className='h-2' max={100} />
</div> </div>
<div className='flex flex-col space-y-1'> <div className='flex flex-col space-y-1'>
<div className='flex justify-between'> <div className='flex justify-between'>
<span>{t('memory')}</span> <span>{t('memory')}</span>
<span>{formatPercentage(serverStatus?.mem ?? 0)}</span> <span>{formatPercentage(serverStatus?.mem ?? 0)}</span>
</div> </div>
<Progress value={(serverStatus?.mem ?? 0) * 100} className='h-2' max={100} /> <Progress value={serverStatus?.mem ?? 0} className='h-2' max={100} />
</div> </div>
<div className='flex flex-col space-y-1'> <div className='flex flex-col space-y-1'>
<div className='flex justify-between'> <div className='flex justify-between'>
<span>{t('disk')}</span> <span>{t('disk')}</span>
<span>{formatPercentage(serverStatus?.disk ?? 0)}</span> <span>{formatPercentage(serverStatus?.disk ?? 0)}</span>
</div> </div>
<Progress value={(serverStatus?.disk ?? 0) * 100} className='h-2' max={100} /> <Progress value={serverStatus?.disk ?? 0} className='h-2' max={100} />
</div> </div>
{isOnline && ( {isOnline && (
<div> <div>

4
apps/admin/app/dashboard/server/node-table.tsx
View File

@ -145,10 +145,10 @@ export default function NodeTable() {
}, },
{ {
accessorKey: 'groupId', accessorKey: 'group_id',
header: t('nodeGroup'), header: t('nodeGroup'),
cell: ({ row }) => { cell: ({ row }) => {
const name = groups?.find((group) => group.id === row.getValue('groupId'))?.name; const name = groups?.find((group) => group.id === row.getValue('group_id'))?.name;
return name ? <Badge variant='outline'>{name}</Badge> : '--'; return name ? <Badge variant='outline'>{name}</Badge> : '--';
}, },
}, },

5
apps/admin/components/dashboard/revenue-statistics-card.tsx
View File

@ -115,7 +115,10 @@ export function RevenueStatisticsCard() {
y={viewBox.cy} y={viewBox.cy}
className='fill-foreground text-2xl font-bold' className='fill-foreground text-2xl font-bold'
> >
{RevenueStatistics?.today.amount_total} {unitConversion(
'centsToDollars',
RevenueStatistics?.today.amount_total,
)}
</tspan> </tspan>
</text> </text>
); );