Skip to content

Commit 47b5b16

Browse files
authored
chore(js): Replace all instances of objectToArray with Object.entries (#14380)
1 parent 50b5f93 commit 47b5b16

File tree

9 files changed

+9
-19
lines changed

9 files changed

+9
-19
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
22

3-
import {objectToArray} from 'app/utils';
43
import {t} from 'app/locale';
54
import ErrorBoundary from 'app/components/errorBoundary';
65
import EventDataSection from 'app/components/events/eventDataSection';
@@ -30,7 +29,7 @@ class EventExtraData extends React.Component {
3029
};
3130

3231
render() {
33-
const extraDataArray = objectToArray(this.props.event.context);
32+
const extraDataArray = Object.entries(this.props.event.context);
3433
return (
3534
<div className="extra-data">
3635
<EventDataSection

src/sentry/static/sentry/app/components/events/interfaces/cspContent.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
33

4-
import {objectToArray} from 'app/utils';
54
import KeyValueList from 'app/components/events/interfaces/keyValueList';
65

76
class CSPContent extends React.Component {
@@ -16,7 +15,7 @@ class CSPContent extends React.Component {
1615
<h4>
1716
<span>{data.effective_directive}</span>
1817
</h4>
19-
<KeyValueList data={objectToArray(data)} isContextData={true} />
18+
<KeyValueList data={Object.entries(data)} isContextData={true} />
2019
</div>
2120
);
2221
}

src/sentry/static/sentry/app/components/events/interfaces/frameRegisters.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import styled from 'react-emotion';
55

66
import Tooltip from 'app/components/tooltip';
77
import {t} from 'app/locale';
8-
import {defined, objectToArray} from 'app/utils';
8+
import {defined} from 'app/utils';
99

1010
const REGISTER_VIEWS = [t('Hexadecimal'), t('Numeric')];
1111

@@ -68,7 +68,7 @@ class FrameRegisters extends React.Component {
6868
};
6969

7070
render() {
71-
const registers = objectToArray(this.props.data).filter(register =>
71+
const registers = Object.entries(this.props.data).filter(register =>
7272
defined(register[1])
7373
);
7474

src/sentry/static/sentry/app/components/events/interfaces/frameVariables.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
33

4-
import {objectToArray} from 'app/utils';
54
import KeyValueList from 'app/components/events/interfaces/keyValueList';
65

76
class FrameVariables extends React.Component {
@@ -16,7 +15,7 @@ class FrameVariables extends React.Component {
1615
};
1716

1817
render() {
19-
const data = objectToArray(this.props.data);
18+
const data = Object.entries(this.props.data);
2019

2120
return (
2221
<KeyValueList data={data} isContextData={true} onClick={this.preventToggling} />

src/sentry/static/sentry/app/components/events/interfaces/generic.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ import SentryTypes from 'app/sentryTypes';
55
import EventDataSection from 'app/components/events/eventDataSection';
66
import KeyValueList from 'app/components/events/interfaces/keyValueList';
77
import {t} from 'app/locale';
8-
import {objectToArray} from 'app/utils';
98

109
function getView(view, data) {
1110
switch (view) {
1211
case 'report':
13-
return <KeyValueList data={objectToArray(data)} isContextData={true} />;
12+
return <KeyValueList data={Object.entries(data)} isContextData={true} />;
1413
case 'raw':
1514
return <pre>{JSON.stringify({'csp-report': data}, null, 2)}</pre>;
1615
default:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
22

3-
import {objectToArray} from 'app/utils';
43
import {t} from 'app/locale';
54
import ClippedBox from 'app/components/clippedBox';
65
import ErrorBoundary from 'app/components/errorBoundary';
@@ -18,7 +17,7 @@ class EventPackageData extends React.Component {
1817
}
1918

2019
render() {
21-
const packages = objectToArray(this.props.event.packages);
20+
const packages = Object.entries(this.props.event.packages);
2221

2322
return (
2423
<EventDataSection event={this.props.event} type="packages" title={t('Packages')}>

src/sentry/static/sentry/app/components/modals/debugFileSourceModal.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from 'react';
33

44
import {t, tct} from 'app/locale';
55
import SentryTypes from 'app/sentryTypes';
6-
import {objectToArray} from 'app/utils';
76
import {
87
AWS_REGIONS,
98
DEBUG_SOURCE_LAYOUTS,
@@ -15,7 +14,7 @@ import Form from 'app/views/settings/components/forms/form';
1514
import FieldFromConfig from 'app/views/settings/components/forms/fieldFromConfig';
1615

1716
function objectToChoices(obj) {
18-
return objectToArray(obj).map(([key, value]) => [key, t(value)]);
17+
return Object.entries(obj).map(([key, value]) => [key, t(value)]);
1918
}
2019

2120
const commonFields = {

src/sentry/static/sentry/app/utils.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ function objectMatchesSubset(obj?: object, other?: object, deep?: boolean): bool
6262
return true;
6363
}
6464

65-
// TODO: instances of objectToArray should be refactored
66-
export const objectToArray = Object.entries;
67-
6865
export function intcomma(x: number): string {
6966
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
7067
}

tests/js/spec/components/toggleRawEventData.spec.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22
import {shallow} from 'enzyme';
33
import EventDataSection from 'app/components/events/eventDataSection';
44
import KeyValueList from 'app/components/events/interfaces/keyValueList';
5-
import {objectToArray} from 'app/utils';
65

76
const data = {
87
metadata: {
@@ -63,7 +62,7 @@ describe('KeyValueList', function() {
6362
plussomeotherstuff: 'here',
6463
andthis: 0,
6564
};
66-
const extraDataArray = objectToArray(context);
65+
const extraDataArray = Object.entries(context);
6766

6867
it('renders formatted', function() {
6968
const component = shallow(

0 commit comments

Comments
 (0)