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

[APM] Chart units don't update when toggling the chart legends #74931

Merged
merged 12 commits into from
Aug 31, 2020
Merged

[APM] Chart units don't update when toggling the chart legends #74931

Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f7ec811
changing unit when legend is disabled
cauemarcondes Aug 13, 2020
98e9173
changing unit when legend is disabled
cauemarcondes Aug 13, 2020
058871e
Merge branch 'master' of github.com:elastic/kibana into apm-chart-unt
cauemarcondes Aug 20, 2020
a04aaba
show individual units in the tooltip
cauemarcondes Aug 20, 2020
a18fe1b
Merge branch 'master' of github.com:elastic/kibana into apm-chart-unt
cauemarcondes Aug 20, 2020
d2da9f1
addressing PR comment
cauemarcondes Aug 20, 2020
4026b33
Merge branch 'master' into apm-chart-unt
elasticmachine Aug 24, 2020
294879e
increasing duration threshold
cauemarcondes Aug 26, 2020
ee533a2
change formatter based on available legends
cauemarcondes Aug 27, 2020
08b307c
Merge branch 'master' of github.com:elastic/kibana into apm-chart-unt
cauemarcondes Aug 27, 2020
4235784
Merge branch 'master' of github.com:elastic/kibana into apm-chart-unt
cauemarcondes Aug 31, 2020
8394800
addressing PR comment
cauemarcondes Aug 31, 2020
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
194 changes: 97 additions & 97 deletions x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@ import {
EuiFlexItem,
EuiIconTip,
EuiPanel,
EuiSpacer,
EuiText,
EuiTitle,
EuiSpacer,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { Location } from 'history';
import React, { Component } from 'react';
import { isEmpty, flatten } from 'lodash';
import { flatten, isEmpty } from 'lodash';
import React from 'react';
import styled from 'styled-components';
import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
import {
TRANSACTION_PAGE_LOAD,
TRANSACTION_REQUEST,
TRANSACTION_ROUTE_CHANGE,
} from '../../../../../common/transaction_types';
import { Coordinate, TimeSeries } from '../../../../../typings/timeseries';
import { ITransactionChartData } from '../../../../selectors/chartSelectors';
import { LicenseContext } from '../../../../context/LicenseContext';
import { IUrlParams } from '../../../../context/UrlParamsContext/types';
import { ITransactionChartData } from '../../../../selectors/chartSelectors';
import {
tpmUnit,
TimeFormatter,
getDurationFormatter,
asDecimal,
asDuration,
TimeFormatter,
tpmUnit,
} from '../../../../utils/formatters';
import { MLJobLink } from '../../Links/MachineLearningLinks/MLJobLink';
import { LicenseContext } from '../../../../context/LicenseContext';
import { TransactionLineChart } from './TransactionLineChart';
import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
import { MLJobLink } from '../../Links/MachineLearningLinks/MLJobLink';
import { BrowserLineChart } from './BrowserLineChart';
import { DurationByCountryMap } from './DurationByCountryMap';
import {
TRANSACTION_PAGE_LOAD,
TRANSACTION_ROUTE_CHANGE,
TRANSACTION_REQUEST,
} from '../../../../../common/transaction_types';
import { TransactionLineChart } from './TransactionLineChart';

interface TransactionChartProps {
charts: ITransactionChartData;
Expand All @@ -59,14 +59,18 @@ const ShiftedEuiText = styled(EuiText)`
top: 5px;
`;

export function getResponseTimeTickFormatter(formatter: TimeFormatter) {
return (t: number) => formatter(t).formatted;
export function getResponseTimeTickFormatter(formatter?: TimeFormatter) {
return (t: number) => {
return formatter ? formatter(t).formatted : asDuration(t);
};
cauemarcondes marked this conversation as resolved.
Show resolved Hide resolved
}

export function getResponseTimeTooltipFormatter(formatter: TimeFormatter) {
export function getResponseTimeTooltipFormatter(formatter?: TimeFormatter) {
return (p: Coordinate) => {
return isValidCoordinateValue(p.y)
? formatter(p.y).formatted
? formatter
? formatter(p.y).formatted
: asDuration(p.y)
cauemarcondes marked this conversation as resolved.
Show resolved Hide resolved
: NOT_AVAILABLE_LABEL;
};
}
Expand All @@ -81,27 +85,30 @@ export function getMaxY(responseTimeSeries: TimeSeries[]) {
return Math.max(...numbers, 0);
}

export class TransactionCharts extends Component<TransactionChartProps> {
public getTPMFormatter = (t: number) => {
const { urlParams } = this.props;
export function TransactionCharts({
charts,
location,
urlParams,
}: TransactionChartProps) {
const getTPMFormatter = (t: number) => {
cauemarcondes marked this conversation as resolved.
Show resolved Hide resolved
const unit = tpmUnit(urlParams.transactionType);
return `${asDecimal(t)} ${unit}`;
};

public getTPMTooltipFormatter = (p: Coordinate) => {
const getTPMTooltipFormatter = (p: Coordinate) => {
return isValidCoordinateValue(p.y)
? this.getTPMFormatter(p.y)
? getTPMFormatter(p.y)
: NOT_AVAILABLE_LABEL;
};

public renderMLHeader(hasValidMlLicense: boolean | undefined) {
const { mlJobId } = this.props.charts;
function renderMLHeader(hasValidMlLicense: boolean | undefined) {
const { mlJobId } = charts;

if (!hasValidMlLicense || !mlJobId) {
return null;
}

const { serviceName, kuery, transactionType } = this.props.urlParams;
const { serviceName, kuery, transactionType } = urlParams;
if (!serviceName) {
return null;
}
Expand Down Expand Up @@ -150,78 +157,71 @@ export class TransactionCharts extends Component<TransactionChartProps> {
);
}

public render() {
const { charts, urlParams } = this.props;
const { responseTimeSeries, tpmSeries } = charts;
const { transactionType } = urlParams;
const maxY = getMaxY(responseTimeSeries);
const formatter = getDurationFormatter(maxY);
const { responseTimeSeries, tpmSeries } = charts;
const { transactionType } = urlParams;

return (
<>
<EuiFlexGrid columns={2} gutterSize="s">
<EuiFlexItem data-cy={`transaction-duration-charts`}>
<EuiPanel>
<React.Fragment>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem>
<EuiTitle size="xs">
<span>{responseTimeLabel(transactionType)}</span>
</EuiTitle>
</EuiFlexItem>
<LicenseContext.Consumer>
{(license) =>
this.renderMLHeader(license?.getFeature('ml').isAvailable)
}
</LicenseContext.Consumer>
</EuiFlexGroup>
<TransactionLineChart
series={responseTimeSeries}
tickFormatY={getResponseTimeTickFormatter(formatter)}
formatTooltipValue={getResponseTimeTooltipFormatter(
formatter
)}
/>
</React.Fragment>
</EuiPanel>
</EuiFlexItem>
return (
<>
<EuiFlexGrid columns={2} gutterSize="s">
<EuiFlexItem data-cy={`transaction-duration-charts`}>
<EuiPanel>
<React.Fragment>
<EuiFlexGroup justifyContent="spaceBetween">
<EuiFlexItem>
<EuiTitle size="xs">
<span>{responseTimeLabel(transactionType)}</span>
</EuiTitle>
</EuiFlexItem>
<LicenseContext.Consumer>
{(license) =>
renderMLHeader(license?.getFeature('ml').isAvailable)
}
</LicenseContext.Consumer>
</EuiFlexGroup>
<TransactionLineChart
series={responseTimeSeries}
tickFormatY={getResponseTimeTickFormatter()}
formatTooltipValue={getResponseTimeTooltipFormatter()}
/>
</React.Fragment>
</EuiPanel>
</EuiFlexItem>

<EuiFlexItem style={{ flexShrink: 1 }}>
<EuiPanel>
<React.Fragment>
<EuiTitle size="xs">
<span>{tpmLabel(transactionType)}</span>
</EuiTitle>
<TransactionLineChart
series={tpmSeries}
tickFormatY={this.getTPMFormatter}
formatTooltipValue={this.getTPMTooltipFormatter}
truncateLegends
/>
</React.Fragment>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGrid>
{transactionType === TRANSACTION_PAGE_LOAD && (
<>
<EuiSpacer size="s" />
<EuiFlexGrid columns={2} gutterSize="s">
<EuiFlexItem>
<EuiPanel>
<DurationByCountryMap />
</EuiPanel>
</EuiFlexItem>
<EuiFlexItem>
<EuiPanel>
<BrowserLineChart />
</EuiPanel>
</EuiFlexItem>
</EuiFlexGrid>
</>
)}
</>
);
}
<EuiFlexItem style={{ flexShrink: 1 }}>
<EuiPanel>
<React.Fragment>
<EuiTitle size="xs">
<span>{tpmLabel(transactionType)}</span>
</EuiTitle>
<TransactionLineChart
series={tpmSeries}
tickFormatY={getTPMFormatter}
formatTooltipValue={getTPMTooltipFormatter}
truncateLegends
/>
</React.Fragment>
</EuiPanel>
</EuiFlexItem>
</EuiFlexGrid>
{transactionType === TRANSACTION_PAGE_LOAD && (
<>
<EuiSpacer size="s" />
<EuiFlexGrid columns={2} gutterSize="s">
<EuiFlexItem>
<EuiPanel>
<DurationByCountryMap />
</EuiPanel>
</EuiFlexItem>
<EuiFlexItem>
<EuiPanel>
<BrowserLineChart />
</EuiPanel>
</EuiFlexItem>
</EuiFlexGrid>
</>
)}
</>
);
}

function tpmLabel(type?: string) {
Expand Down