Skip to content

feat(events-v2): Move calculating other category into TagDistributionMeter #13530

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

Merged
merged 1 commit into from
Jun 5, 2019
Merged

feat(events-v2): Move calculating other category into TagDistributionMeter #13530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions src/sentry/static/sentry/app/components/group/tagDistributionMeter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
import React from 'react';
import createReactClass from 'create-react-class';

import {t} from 'app/locale';
import {deviceNameMapper, loadDeviceListModule} from 'app/components/deviceName';
import SentryTypes from 'app/sentryTypes';
import withEnvironment from 'app/utils/withEnvironment';
Expand Down Expand Up @@ -82,17 +81,6 @@ const GroupTagDistributionMeter = createReactClass({
let segments = [];

if (topValues) {
const totalVisible = topValues.reduce((sum, value) => sum + value.count, 0);
const hasOther = totalVisible < totalValues;

if (hasOther) {
topValues.push({
value: 'other',
name: t('Other'),
count: totalValues - totalVisible,
});
}

segments = this.state.iOSDeviceList
? topValues.map(value => ({
...value,
Expand Down
43 changes: 27 additions & 16 deletions src/sentry/static/sentry/app/components/tagDistributionMeter/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ export default class TagDistributionMeter extends React.Component {
renderSegments() {
const {segments, totalValues} = this.props;

const totalVisible = segments.reduce((sum, value) => sum + value.count, 0);
const hasOther = totalVisible < totalValues;

if (hasOther) {
segments.push({
isOther: true,
name: t('Other'),
value: 'other',
count: totalValues - totalVisible,
});
}

return (
<React.Fragment>
{segments.map((value, index) => {
Expand All @@ -55,10 +67,11 @@ export default class TagDistributionMeter extends React.Component {
<Tooltip key={value.value} title={tooltipHtml} containerDisplayMode="inline">
<Segment
style={{width: pct + '%'}}
to={value.url}
to={value.isOther ? null : value.url}
index={index}
first={index === 0}
last={index === segments.length - 1}
isOther={!!value.isOther}
>
<Description first={index == 0}>
<Percentage>{pctLabel}%</Percentage>
Expand Down Expand Up @@ -124,20 +137,18 @@ const Title = styled('div')`
line-height: 1;
`;

const getColor = p => {
return [
'#7c7484',
'#867f90',
'#918a9b',
'#9b96a7',
'#a6a1b3',
'#b0acbe',
'#bbb7ca',
'#c5c3d6',
'#d0cee1',
'#dad9ed',
][p.index];
};
const colors = [
'#7c7484',
'#867f90',
'#918a9b',
'#9b96a7',
'#a6a1b3',
'#b0acbe',
'#bbb7ca',
'#c5c3d6',
'#d0cee1',
'#dad9ed',
];

const Segment = styled(Link, {shouldForwardProp: isPropValid})`
height: 16px;
Expand All @@ -154,7 +165,7 @@ const Segment = styled(Link, {shouldForwardProp: isPropValid})`
border-top-right-radius: ${p => p.last && p.theme.borderRadius};
border-bottom-right-radius: ${p => p.last && p.theme.borderRadius};

background-color: ${getColor};
background-color: ${p => (p.isOther ? colors[colors.length - 1] : colors[p.index])};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is index used elsewhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean? It's used a couple of times in this component

`;

const Description = styled('span', {shouldForwardProp: isPropValid})`
Expand Down