From 74d93df74b9907a879395d4a2dfbe349c95d2314 Mon Sep 17 00:00:00 2001 From: gala1234 Date: Mon, 16 May 2022 13:41:10 +0200 Subject: [PATCH 1/2] adding av uptime on mix nodes table --- explorer/src/components/MixNodes/index.ts | 3 +++ explorer/src/pages/Mixnodes/index.tsx | 17 +++++++++++++++++ explorer/src/typeDefs/explorer-api.ts | 1 + 3 files changed, 21 insertions(+) diff --git a/explorer/src/components/MixNodes/index.ts b/explorer/src/components/MixNodes/index.ts index d803c2e5ea..fba739771d 100644 --- a/explorer/src/components/MixNodes/index.ts +++ b/explorer/src/components/MixNodes/index.ts @@ -12,6 +12,7 @@ export type MixnodeRowType = { host: string; layer: string; profit_percentage: string; + avg_uptime: number; }; export function mixnodeToGridRow(arrayOfMixnodes?: MixNodeResponse): MixnodeRowType[] { @@ -24,6 +25,7 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem): const totalBond = pledge + delegations; const selfPercentage = ((pledge * 100) / totalBond).toFixed(2); const profitPercentage = item.mix_node.profit_margin_percent || 0; + const avgUptime = item.avg_uptime; return { id: item.owner, status: item.status, @@ -35,5 +37,6 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem): host: item?.mix_node?.host || '', layer: item?.layer || '', profit_percentage: `${profitPercentage}%`, + avg_uptime: avgUptime, }; } diff --git a/explorer/src/pages/Mixnodes/index.tsx b/explorer/src/pages/Mixnodes/index.tsx index 1386aa38cc..50f37248e2 100644 --- a/explorer/src/pages/Mixnodes/index.tsx +++ b/explorer/src/pages/Mixnodes/index.tsx @@ -231,6 +231,23 @@ export const PageMixnodes: React.FC = () => { ), }, + { + field: 'avg_uptime', + headerName: 'Average Uptime', + renderHeader: () => , + headerClassName: 'MuiDataGrid-header-override', + width: 140, + headerAlign: 'left', + renderCell: (params: GridRenderCellParams) => ( + + {params.value} + + ), + }, ]; const handlePageSize = (event: SelectChangeEvent) => { diff --git a/explorer/src/typeDefs/explorer-api.ts b/explorer/src/typeDefs/explorer-api.ts index 9285f78b42..36dd210181 100644 --- a/explorer/src/typeDefs/explorer-api.ts +++ b/explorer/src/typeDefs/explorer-api.ts @@ -83,6 +83,7 @@ export interface MixNodeResponseItem { two_letter_iso_country_code: string; }; mix_node: MixNode; + avg_uptime: number; } export type MixNodeResponse = MixNodeResponseItem[]; From 003ea095cc48177fc00b75833e852c91f8569fce Mon Sep 17 00:00:00 2001 From: gala1234 Date: Mon, 16 May 2022 14:12:31 +0200 Subject: [PATCH 2/2] remove not needed variable, PR request --- explorer/src/components/MixNodes/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/explorer/src/components/MixNodes/index.ts b/explorer/src/components/MixNodes/index.ts index fba739771d..b04570a589 100644 --- a/explorer/src/components/MixNodes/index.ts +++ b/explorer/src/components/MixNodes/index.ts @@ -25,7 +25,6 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem): const totalBond = pledge + delegations; const selfPercentage = ((pledge * 100) / totalBond).toFixed(2); const profitPercentage = item.mix_node.profit_margin_percent || 0; - const avgUptime = item.avg_uptime; return { id: item.owner, status: item.status, @@ -37,6 +36,6 @@ export function mixNodeResponseItemToMixnodeRowType(item: MixNodeResponseItem): host: item?.mix_node?.host || '', layer: item?.layer || '', profit_percentage: `${profitPercentage}%`, - avg_uptime: avgUptime, + avg_uptime: item.avg_uptime, }; }