From 9c92b555698b02d2cb0c8fab464bb14787fb8afd Mon Sep 17 00:00:00 2001 From: Cifko Date: Fri, 19 Jan 2024 14:35:49 +0100 Subject: [PATCH] fix: ui --- .../src/routes/Committees/Committees.tsx | 6 +++--- .../src/routes/Committees/CommitteesPieChart.tsx | 14 ++++++++++---- .../src/routes/Committees/CommitteesRadial.tsx | 8 ++++---- .../src/routes/Committees/CommitteesWaterfall.tsx | 12 ++++++------ .../src/utils/interfaces.tsx | 4 ++-- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/applications/tari_validator_node_web_ui/src/routes/Committees/Committees.tsx b/applications/tari_validator_node_web_ui/src/routes/Committees/Committees.tsx index b8aa8340a..899ceb1fd 100644 --- a/applications/tari_validator_node_web_ui/src/routes/Committees/Committees.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/Committees/Committees.tsx @@ -66,9 +66,9 @@ function Committees({ committees, peerId }: { committees: CommitteeShardInfo[] | {committees.map((committee) => ( diff --git a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesPieChart.tsx b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesPieChart.tsx index bcc4bf6d7..d33f8cf03 100644 --- a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesPieChart.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesPieChart.tsx @@ -31,17 +31,23 @@ const MyChartComponent = ({ chartData }: MyChartComponentProps) => { useEffect(() => { const mappedTitles = chartData.committees.map((shardInfo) => { - return `${shardInfo.shard_range.start.slice(0, 6)}... - ${shardInfo.shard_range.end.slice(0, 6)}...`; + return `${shardInfo.substate_address_range.start.slice(0, 6)}... - ${shardInfo.substate_address_range.end.slice( + 0, + 6, + )}...`; }); setTitles(mappedTitles); const mappedContent = chartData.committees.reverse().map((shardInfo) => { const data: any = { value: shardInfo.validators.length, - name: `${shardInfo.shard_range.start.slice(0, 6)}... - ${shardInfo.shard_range.end.slice(0, 6)}...`, + name: `${shardInfo.substate_address_range.start.slice(0, 6)}... - ${shardInfo.substate_address_range.end.slice( + 0, + 6, + )}...`, committee: shardInfo.validators, - link: `/committees/${shardInfo.shard_range.start},${shardInfo.shard_range.end}`, - range: `${shardInfo.shard_range.start}
${shardInfo.shard_range.end}`, + link: `/committees/${shardInfo.substate_address_range.start},${shardInfo.substate_address_range.end}`, + range: `${shardInfo.substate_address_range.start}
${shardInfo.substate_address_range.end}`, }; return data; }); diff --git a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesRadial.tsx b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesRadial.tsx index e0f89fff8..cbd4e672e 100644 --- a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesRadial.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesRadial.tsx @@ -56,8 +56,8 @@ export default function CommitteesRadial({ committees }: { committees: GetNetwor }; dataset.forEach((data: CommitteeShardInfo) => { - const start = fromHexString(data.shard_range.start)[0]; - const end = fromHexString(data.shard_range.end)[0]; + const start = fromHexString(data.substate_address_range.start)[0]; + const end = fromHexString(data.substate_address_range.end)[0]; switch (true) { case start === end: @@ -86,7 +86,7 @@ export default function CommitteesRadial({ committees }: { committees: GetNetwor } }); setChartData(info); - const newTitles = dataset.map((info) => `Committee ${info.bucket}`); + const newTitles = dataset.map((info) => `Committee ${info.shard}`); setTitles(newTitles); }, [committees]); @@ -95,7 +95,7 @@ export default function CommitteesRadial({ committees }: { committees: GetNetwor const data = committees.committees[dataIndex]; const { validators, - shard_range: { start, end }, + substate_address_range: { start, end }, } = data; const memberList = validators diff --git a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesWaterfall.tsx b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesWaterfall.tsx index 31552c080..453cbb72b 100644 --- a/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesWaterfall.tsx +++ b/applications/tari_validator_node_web_ui/src/routes/Committees/CommitteesWaterfall.tsx @@ -23,7 +23,7 @@ import { useState, useEffect } from "react"; import { fromHexString } from "../VN/Components/helpers"; import EChartsReact from "echarts-for-react"; -import { ICommittees, ICommitteeChart, ICommitteeMap } from "../../utils/interfaces"; +import { ICommitteeChart } from "../../utils/interfaces"; import "../../theme/echarts.css"; import { CommitteeShardInfo } from "../../utils/interfaces"; @@ -56,8 +56,8 @@ export default function CommitteesWaterfall({ committees }: { committees: Commit }; committees.forEach((data) => { - const firstValue = fromHexString(data.shard_range.start)[0]; - const secondValue = fromHexString(data.shard_range.end)[0]; + const firstValue = fromHexString(data.substate_address_range.start)[0]; + const secondValue = fromHexString(data.substate_address_range.end)[0]; switch (true) { case firstValue === secondValue: info.activeleft.push(0); @@ -86,15 +86,15 @@ export default function CommitteesWaterfall({ committees }: { committees: Commit }); setChartData(info); setDivHeight(committees.length * 50); - const newTitles = committees.map((data) => `Committee ${data.bucket}`); + const newTitles = committees.map((data) => `Committee ${data.shard}`); setTitles(newTitles); }, [committees]); function tooltipFormatter(params: any) { const dataIndex = params[0].dataIndex; const data = committees[dataIndex]; - const begin = fromHexString(data.shard_range.start)[0]; - const end = fromHexString(data.shard_range.end)[0]; + const begin = fromHexString(data.substate_address_range.start)[0]; + const end = fromHexString(data.substate_address_range.end)[0]; const memberList = data.validators .map((member) => `
  • ${member.address}
    • `) diff --git a/applications/tari_validator_node_web_ui/src/utils/interfaces.tsx b/applications/tari_validator_node_web_ui/src/utils/interfaces.tsx index f6c3be060..eb7618663 100644 --- a/applications/tari_validator_node_web_ui/src/utils/interfaces.tsx +++ b/applications/tari_validator_node_web_ui/src/utils/interfaces.tsx @@ -72,8 +72,8 @@ interface GetNetworkCommitteesResponse { } interface CommitteeShardInfo { - bucket: number; - shard_range: { + shard: number; + substate_address_range: { end: string; start: string; };