Skip to content

Commit 94484e4

Browse files
committed
feat: azure t2, t3 display
1 parent 5afcaf3 commit 94484e4

1 file changed

Lines changed: 25 additions & 17 deletions

File tree

frontend/src/components/ui/ag-columns.tsx

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,20 @@ export type GCPData = {
2323
}
2424

2525
export type AzureData = {
26-
id: string
26+
id: number
2727
InstanceTier: string
2828
InstanceType: string
2929
Region: string
30+
AvailabilityZone: string
3031
OndemandPrice: number
3132
SpotPrice: number
33+
Savings: number
3234
IF: number
33-
Score: string
34-
AvailabilityZone: string
35-
SPS_Update_Time: string
35+
Score: number
36+
DesiredCount: number
37+
T2: number
38+
T3: number
39+
Time: string
3640
}
3741

3842
const formatNumber = (params: any) => {
@@ -41,6 +45,12 @@ const formatNumber = (params: any) => {
4145
return num
4246
}
4347

48+
const formatSavings = (params: any) => {
49+
const num = params.value
50+
if (num === -1 || num === "-1" || num === undefined || num === null) return "N/A"
51+
return String(Math.round(num))
52+
}
53+
4454
const calculateSavings = (params: any) => {
4555
const data = params.data
4656
let ondemand, spot
@@ -81,12 +91,12 @@ const formatDate = (params: any) => {
8191
}
8292

8393
export const awsColDefs: ColDef<AWSData>[] = [
84-
{ field: "InstanceType", valueFormatter: formatNumber },
94+
{ field: "InstanceType", headerName: "Type", valueFormatter: formatNumber },
8595
{ field: "Region", valueFormatter: formatNumber },
8696
{ field: "AZ", headerName: "AZ", valueFormatter: formatNumber },
8797
{ field: "SPS", headerName: "Availability", valueFormatter: formatNumber },
88-
{ field: "T2", valueFormatter: formatNumber, width: 80, maxWidth: 100 },
89-
{ field: "T3", valueFormatter: formatNumber, width: 80, maxWidth: 100 },
98+
{ field: "T2", valueFormatter: formatNumber, width: 70, maxWidth: 100 },
99+
{ field: "T3", valueFormatter: formatNumber, width: 70, maxWidth: 100 },
90100
{ field: "IF", headerName: "Interruption Ratio", valueFormatter: formatNumber },
91101
{ field: "SpotPrice", headerName: "SpotPrice ($)", valueFormatter: formatNumber },
92102
{
@@ -109,17 +119,15 @@ export const gcpColDefs: ColDef<GCPData>[] = [
109119
]
110120

111121
export const azureColDefs: ColDef<AzureData>[] = [
112-
{ field: "InstanceTier", valueFormatter: formatNumber },
113-
{ field: "InstanceType", valueFormatter: formatNumber },
122+
{ field: "InstanceTier", headerName: "Tier", valueFormatter: formatNumber, width: 60, maxWidth: 100 },
123+
{ field: "InstanceType", headerName: "Type", valueFormatter: formatNumber },
114124
{ field: "Region", valueFormatter: formatNumber },
115-
{ field: "OndemandPrice", valueFormatter: formatNumber },
125+
{ field: "AvailabilityZone", headerName: "AZ", valueFormatter: formatNumber, width: 40, maxWidth: 80 },
116126
{ field: "SpotPrice", valueFormatter: formatNumber },
117-
{ field: "IF", headerName: "IF", valueFormatter: formatNumber },
118-
{
119-
headerName: "Savings (%)",
120-
valueGetter: calculateSavings
121-
},
127+
{ field: "Savings", headerName: "Savings (%)", valueFormatter: formatSavings },
128+
{ field: "IF", headerName: "IF", valueFormatter: formatNumber, width: 60, maxWidth: 100 },
122129
{ field: "Score", headerName: "Availability", valueFormatter: formatNumber },
123-
{ field: "AvailabilityZone", headerName: "AZ", valueFormatter: formatNumber },
124-
{ field: "SPS_Update_Time", headerName: "Date", valueFormatter: formatDate },
130+
{ field: "T2", valueFormatter: formatNumber, width: 70, maxWidth: 100 },
131+
{ field: "T3", valueFormatter: formatNumber, width: 70, maxWidth: 100 },
132+
{ field: "Time", headerName: "Date", valueFormatter: formatDate },
125133
]

0 commit comments

Comments
 (0)