From 36c76674b626db468bf40c01d883c6a6fc8dca31 Mon Sep 17 00:00:00 2001
From: "web@ppanel" <web@ppanel.dev>
Date: Wed, 8 Jan 2025 00:43:32 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(dashboard):=20Correct=20prog?=
 =?UTF-8?q?ress=20value=20calculations=20and=20update=20groupId=20accessor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/dashboard/server/node-status.tsx             | 6 +++---
 apps/admin/app/dashboard/server/node-table.tsx              | 4 ++--
 apps/admin/components/dashboard/revenue-statistics-card.tsx | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/admin/app/dashboard/server/node-status.tsx b/apps/admin/app/dashboard/server/node-status.tsx
index 2a4e54a..0b25664 100644
--- a/apps/admin/app/dashboard/server/node-status.tsx
+++ b/apps/admin/app/dashboard/server/node-status.tsx
@@ -54,21 +54,21 @@ export function NodeStatusCell({ status }: { status: API.NodeStatus }) {
                 <span>CPU</span>
                 <span>{formatPercentage(serverStatus?.cpu ?? 0)}</span>
               </div>
-              <Progress value={(serverStatus?.cpu ?? 0) * 100} className='h-2' max={100} />
+              <Progress value={serverStatus?.cpu ?? 0} className='h-2' max={100} />
             </div>
             <div className='flex flex-col space-y-1'>
               <div className='flex justify-between'>
                 <span>{t('memory')}</span>
                 <span>{formatPercentage(serverStatus?.mem ?? 0)}</span>
               </div>
-              <Progress value={(serverStatus?.mem ?? 0) * 100} className='h-2' max={100} />
+              <Progress value={serverStatus?.mem ?? 0} className='h-2' max={100} />
             </div>
             <div className='flex flex-col space-y-1'>
               <div className='flex justify-between'>
                 <span>{t('disk')}</span>
                 <span>{formatPercentage(serverStatus?.disk ?? 0)}</span>
               </div>
-              <Progress value={(serverStatus?.disk ?? 0) * 100} className='h-2' max={100} />
+              <Progress value={serverStatus?.disk ?? 0} className='h-2' max={100} />
             </div>
             {isOnline && (
               <div>
diff --git a/apps/admin/app/dashboard/server/node-table.tsx b/apps/admin/app/dashboard/server/node-table.tsx
index b1f8c3b..e92e3ce 100644
--- a/apps/admin/app/dashboard/server/node-table.tsx
+++ b/apps/admin/app/dashboard/server/node-table.tsx
@@ -145,10 +145,10 @@ export default function NodeTable() {
         },
 
         {
-          accessorKey: 'groupId',
+          accessorKey: 'group_id',
           header: t('nodeGroup'),
           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> : '--';
           },
         },
diff --git a/apps/admin/components/dashboard/revenue-statistics-card.tsx b/apps/admin/components/dashboard/revenue-statistics-card.tsx
index 9fbab15..94ac9d3 100644
--- a/apps/admin/components/dashboard/revenue-statistics-card.tsx
+++ b/apps/admin/components/dashboard/revenue-statistics-card.tsx
@@ -115,7 +115,10 @@ export function RevenueStatisticsCard() {
                                 y={viewBox.cy}
                                 className='fill-foreground text-2xl font-bold'
                               >
-                                {RevenueStatistics?.today.amount_total}
+                                {unitConversion(
+                                  'centsToDollars',
+                                  RevenueStatistics?.today.amount_total,
+                                )}
                               </tspan>
                             </text>
                           );