diff --git a/src/components/SummaryPanel/ErrorRatePieChart.tsx b/src/components/SummaryPanel/ErrorRatePieChart.tsx index 6a36d6888d..2ff1918e0f 100644 --- a/src/components/SummaryPanel/ErrorRatePieChart.tsx +++ b/src/components/SummaryPanel/ErrorRatePieChart.tsx @@ -2,7 +2,10 @@ import * as React from 'react'; import { PieChart } from 'patternfly-react'; type ErrorRatePieChartPropType = { - percentError: number; + percent2xx: number; + percent3xx: number; + percent4xx: number; + percent5xx: number; width?: number; height?: number; showLegend?: boolean; @@ -11,11 +14,14 @@ type ErrorRatePieChartPropType = { export default class ErrorRatePieChart extends React.Component { static defaultProps: ErrorRatePieChartPropType = { - percentError: 0, - width: 200, - height: 80, + percent2xx: 0, + percent3xx: 0, + percent4xx: 0, + percent5xx: 0, + width: 230, + height: 110, showLegend: true, - legendPos: 'right' + legendPos: 'bottom' }; constructor(props: ErrorRatePieChartPropType) { @@ -23,23 +29,25 @@ export default class ErrorRatePieChart extends React.Component this.tooltipFn }} legend={{ show: this.props.showLegend, position: this.props.legendPos }} /> ); } - - tooltipFn = () => { - // TBD - }; } diff --git a/src/components/SummaryPanel/InOutRateTable.tsx b/src/components/SummaryPanel/InOutRateTable.tsx index 417182d47e..27a19b0c53 100644 --- a/src/components/SummaryPanel/InOutRateTable.tsx +++ b/src/components/SummaryPanel/InOutRateTable.tsx @@ -15,10 +15,32 @@ type InOutRateTablePropType = { export default class InOutRateTable extends React.Component { render() { + // for the table const inErrRate: number = this.props.inRate4xx + this.props.inRate5xx; const outErrRate: number = this.props.outRate4xx + this.props.outRate5xx; - const percentInErr = this.props.inRate === 0 ? 0 : inErrRate / this.props.inRate * 100; - const percentOutErr = this.props.outRate === 0 ? 0 : outErrRate / this.props.outRate * 100; + const percentInErr: number = this.props.inRate === 0 ? 0 : inErrRate / this.props.inRate * 100; + const percentOutErr: number = this.props.outRate === 0 ? 0 : outErrRate / this.props.outRate * 100; + const percentInSuccess: number = 100 - percentInErr; + const percentOutSuccess: number = 100 - percentOutErr; + + // for the pie charts + const rate2xxIn: number = + this.props.inRate === 0 + ? 0 + : this.props.inRate - this.props.inRate3xx - this.props.inRate4xx - this.props.inRate5xx; + const rate2xxOut: number = + this.props.outRate === 0 + ? 0 + : this.props.outRate - this.props.outRate3xx - this.props.outRate4xx - this.props.outRate5xx; + const percent2xxIn: number = this.props.inRate === 0 ? 0 : rate2xxIn / this.props.inRate * 100; + const percent3xxIn: number = this.props.inRate === 0 ? 0 : this.props.inRate3xx / this.props.inRate * 100; + const percent4xxIn: number = this.props.inRate === 0 ? 0 : this.props.inRate4xx / this.props.inRate * 100; + const percent5xxIn: number = this.props.inRate === 0 ? 0 : this.props.inRate5xx / this.props.inRate * 100; + const percent2xxOut: number = this.props.outRate === 0 ? 0 : rate2xxOut / this.props.outRate * 100; + const percent3xxOut: number = this.props.outRate === 0 ? 0 : this.props.outRate3xx / this.props.outRate * 100; + const percent4xxOut: number = this.props.outRate === 0 ? 0 : this.props.outRate4xx / this.props.outRate * 100; + const percent5xxOut: number = this.props.outRate === 0 ? 0 : this.props.outRate5xx / this.props.outRate * 100; + return (
{this.props.title} @@ -27,9 +49,7 @@ export default class InOutRateTable extends React.Component Total - 3xx - 4xx - 5xx + %Success %Error @@ -37,29 +57,35 @@ export default class InOutRateTable extends React.Component In {this.props.inRate.toFixed(2)} - {this.props.inRate3xx.toFixed(2)} - {this.props.inRate4xx.toFixed(2)} - {this.props.inRate5xx.toFixed(2)} + {percentInSuccess.toFixed(2)} {percentInErr.toFixed(2)} Out {this.props.outRate.toFixed(2)} - {this.props.outRate3xx.toFixed(2)} - {this.props.outRate4xx.toFixed(2)} - {this.props.outRate5xx.toFixed(2)} + {percentOutSuccess.toFixed(2)} {percentOutErr.toFixed(2)} In - + Out - + diff --git a/src/components/SummaryPanel/RateTable.tsx b/src/components/SummaryPanel/RateTable.tsx index d90e5c0f72..c5d7980f71 100644 --- a/src/components/SummaryPanel/RateTable.tsx +++ b/src/components/SummaryPanel/RateTable.tsx @@ -11,8 +11,19 @@ type RateTablePropType = { export default class RateTable extends React.Component { render() { + // for the table const errRate: number = this.props.rate4xx + this.props.rate5xx; - const percentErr = this.props.rate === 0 ? 0 : errRate / this.props.rate * 100; + const percentErr: number = this.props.rate === 0 ? 0 : errRate / this.props.rate * 100; + const successErr: number = 100 - percentErr; + + // for the pie chart + const rate2xx: number = + this.props.rate === 0 ? 0 : this.props.rate - this.props.rate3xx - this.props.rate4xx - this.props.rate5xx; + const percent2xx: number = this.props.rate === 0 ? 0 : rate2xx / this.props.rate * 100; + const percent3xx: number = this.props.rate === 0 ? 0 : this.props.rate3xx / this.props.rate * 100; + const percent4xx: number = this.props.rate === 0 ? 0 : this.props.rate4xx / this.props.rate * 100; + const percent5xx: number = this.props.rate === 0 ? 0 : this.props.rate5xx / this.props.rate * 100; + return (
{this.props.title} @@ -20,23 +31,24 @@ export default class RateTable extends React.Component { Total - 3xx - 4xx - 5xx + %Success %Error {this.props.rate.toFixed(2)} - {this.props.rate3xx.toFixed(2)} - {this.props.rate4xx.toFixed(2)} - {this.props.rate5xx.toFixed(2)} + {successErr.toFixed(2)} {percentErr.toFixed(2)} - +
); }