Skip to content

Commit 0f9b4f8

Browse files
authored
feat(apm): Update props to address proptype warnings for new transaction attributes (SEN-800) (#14040)
1 parent fe89847 commit 0f9b4f8

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

src/sentry/static/sentry/app/components/eventOrGroupHeader.jsx

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import styled, {css} from 'react-emotion';
55
import classNames from 'classnames';
66
import {capitalize} from 'lodash';
77

8-
import {Metadata} from 'app/sentryTypes';
8+
import SentryTypes from 'app/sentryTypes';
99
import EventOrGroupTitle from 'app/components/eventOrGroupTitle';
1010
import Tooltip from 'app/components/tooltip';
1111
import {getMessage, getLocation} from 'app/utils/events';
@@ -17,22 +17,7 @@ class EventOrGroupHeader extends React.Component {
1717
static propTypes = {
1818
params: PropTypes.object,
1919
/** Either an issue or event **/
20-
data: PropTypes.shape({
21-
id: PropTypes.string,
22-
level: PropTypes.string,
23-
type: PropTypes.oneOf([
24-
'error',
25-
'csp',
26-
'hpkp',
27-
'expectct',
28-
'expectstaple',
29-
'default',
30-
]).isRequired,
31-
title: PropTypes.string,
32-
metadata: Metadata,
33-
groupID: PropTypes.string,
34-
culprit: PropTypes.string,
35-
}),
20+
data: PropTypes.oneOfType([SentryTypes.Event, SentryTypes.Group]),
3621
includeLink: PropTypes.bool,
3722
hideIcons: PropTypes.bool,
3823
hideLevel: PropTypes.bool,

src/sentry/static/sentry/app/components/eventOrGroupTitle.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class EventOrGroupTitle extends React.Component {
1313
'expectct',
1414
'expectstaple',
1515
'default',
16+
'transaction',
1617
]).isRequired,
1718
title: PropTypes.string,
1819
metadata: Metadata.isRequired,

src/sentry/static/sentry/app/components/events/groupingInfo.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ class EventGroupingInfo extends AsyncComponent {
248248
static propTypes = {
249249
api: PropTypes.object,
250250
organization: SentryTypes.Organization.isRequired,
251-
group: SentryTypes.Group.isRequired,
252251
projectId: PropTypes.string.isRequired,
253252
event: SentryTypes.Event.isRequired,
254253
};

src/sentry/static/sentry/app/sentryTypes.jsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@ export const Member = PropTypes.shape({
148148
user: User,
149149
});
150150

151+
const EventOrGroupType = PropTypes.oneOf([
152+
'error',
153+
'csp',
154+
'hpkp',
155+
'expectct',
156+
'expectstaple',
157+
'default',
158+
'transaction',
159+
]);
160+
151161
export const Group = PropTypes.shape({
152162
id: PropTypes.string.isRequired,
153163
annotations: PropTypes.array,
@@ -174,7 +184,7 @@ export const Group = PropTypes.shape({
174184
status: PropTypes.string,
175185
statusDetails: PropTypes.object,
176186
title: PropTypes.string,
177-
type: PropTypes.oneOf(['error', 'csp', 'default']),
187+
type: EventOrGroupType,
178188
userCount: PropTypes.number,
179189
});
180190

@@ -186,7 +196,7 @@ export const Event = PropTypes.shape({
186196
dateReceived: PropTypes.string,
187197
entries: PropTypes.arrayOf(
188198
PropTypes.shape({
189-
data: PropTypes.object,
199+
data: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
190200
type: PropTypes.string,
191201
})
192202
),
@@ -212,7 +222,7 @@ export const Event = PropTypes.shape({
212222
value: PropTypes.string,
213223
})
214224
),
215-
type: PropTypes.oneOf(['error', 'csp', 'default']),
225+
type: EventOrGroupType,
216226
user: PropTypes.object,
217227
});
218228

0 commit comments

Comments
 (0)