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.

Sign up for GitHub

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

Jump to bottom

Monitor Tab: Cannot choose another timeframe #898

Merged
merged 6 commits into from
Mar 1, 2022
Merged

Monitor Tab: Cannot choose another timeframe #898

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
612c5fe
Fix bug
Feb 27, 2022
9a66c04
Merge branch 'main' into fix-timeframe-bug
Feb 28, 2022
f047bad
New implementation + test
Feb 28, 2022
360fa2c
Merge branch 'fix-timeframe-bug' of https://github.com/nofar9792/jaeg…
Feb 28, 2022
c435f67
Merge branch 'main' into fix-timeframe-bug
Feb 28, 2022
2ce04a8
Merge branch 'main' into fix-timeframe-bug
Feb 28, 2022
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
13 changes: 9 additions & 4 deletions packages/jaeger-ui/src/components/Monitor/ServicesView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const getLoopbackInterval = (interval: number) => {
// export for tests
export class MonitorATMServicesViewImpl extends React.PureComponent<TProps, StateType> {
graphDivWrapper: React.RefObject<HTMLInputElement>;
graphXDomain: number[];
graphXDomain: number[] = [];
serviceSelectorValue: string = '';
endTime: number = Date.now();
state = {
Expand All @@ -101,9 +101,6 @@ export class MonitorATMServicesViewImpl extends React.PureComponent<TProps, Stat
constructor(props: TProps) {
super(props);
this.graphDivWrapper = React.createRef();

const currentTime = Date.now();
this.graphXDomain = [currentTime - props.selectedTimeFrame, currentTime];
}

componentDidMount() {
Expand All @@ -114,6 +111,7 @@ export class MonitorATMServicesViewImpl extends React.PureComponent<TProps, Stat
}
window.addEventListener('resize', this.updateDimensions.bind(this));
this.updateDimensions.apply(this);
this.calcGraphXDomain();
}

componentDidUpdate(nextProps: TProps) {
Expand All @@ -124,12 +122,19 @@ export class MonitorATMServicesViewImpl extends React.PureComponent<TProps, Stat
} else if (!_isEqual(nextProps.services, services)) {
this.fetchMetrics();
}

this.calcGraphXDomain();
}

componentWillUnmount() {
window.removeEventListener('resize', this.updateDimensions.bind(this));
}

calcGraphXDomain() {
const currentTime = Date.now();
this.graphXDomain = [currentTime - this.props.selectedTimeFrame, currentTime];
}

updateDimensions() {
if (this.graphDivWrapper.current) {
this.setState({
Expand Down