Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace react-vis with recharts #2558

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 238 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/jaeger-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"react-vis": "1.11.12",
"react-vis-force": "^0.3.1",
"react-window": "^1.8.10",
"recharts": "^2.15.0",
"redux": "^4.2.1",
"redux-actions": "2.6.5",
"redux-first-history": "^5.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ const calcDisplayTimeUnit = (serviceLatencies: ServiceMetricsObject | ServiceMet
};

// export for tests
export const yAxisTickFormat = (timeInMS: number, displayTimeUnit: string) =>
convertToTimeUnit(timeInMS * 1000, displayTimeUnit);
export const yAxisTickFormat = (timeInMS: number, displayTimeUnit: string): string => {
const formattedValue = convertToTimeUnit(timeInMS * 1000, displayTimeUnit);
return formattedValue.toString();
}

const convertServiceErrorRateToPercentages = (serviceErrorRate: null | ServiceMetricsObject) => {
if (!serviceErrorRate) return null;
Expand Down Expand Up @@ -332,10 +334,8 @@ export class MonitorATMServicesViewImpl extends React.PureComponent<TProps, Stat
Aggregation of all &quot;{this.getSelectedService()}&quot; metrics in selected timeframe.{' '}
<a
href={prefixUrl(
`/search?end=${Date.now()}000&limit=20&lookback=${
selectedTimeFrame / (3600 * 1000)
}h&maxDuration&minDuration&service=${this.getSelectedService()}&start=${
Date.now() - selectedTimeFrame
`/search?end=${Date.now()}000&limit=20&lookback=${selectedTimeFrame / (3600 * 1000)
}h&maxDuration&minDuration&service=${this.getSelectedService()}&start=${Date.now() - selectedTimeFrame
}000`
)}
target="blank"
Expand Down
Loading