Skip to content

Commit 98eebe2

Browse files
authored
ref(ui): Move components to more logical folders (#13656)
Also codesplits the ProjectEnvironments view
1 parent 5aa04e5 commit 98eebe2

File tree

25 files changed

+36
-34
lines changed

25 files changed

+36
-34
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import styled from 'react-emotion';
77
import {assignToUser, assignToActor, clearAssignment} from 'app/actionCreators/group';
88
import {t} from 'app/locale';
99
import {valueIsEqual, buildUserId, buildTeamId} from 'app/utils';
10-
import ActorAvatar from 'app/components/actorAvatar';
10+
import ActorAvatar from 'app/components/avatar/actorAvatar';
1111
import Avatar from 'app/components/avatar';
1212
import ConfigStore from 'app/stores/configStore';
1313
import DropdownAutoComplete from 'app/components/dropdownAutoComplete';

src/sentry/static/sentry/app/components/group/suggestedOwnerHovercard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import moment from 'moment';
44
import styled from 'react-emotion';
55

66
import {t, tct} from 'app/locale';
7-
import ActorAvatar from 'app/components/actorAvatar';
7+
import ActorAvatar from 'app/components/avatar/actorAvatar';
88
import Alert from 'app/components/alert';
99
import Hovercard from 'app/components/hovercard';
1010
import InlineSvg from 'app/components/inlineSvg';

src/sentry/static/sentry/app/components/group/suggestedOwners.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {assignToUser, assignToActor} from 'app/actionCreators/group';
66
import {openCreateOwnershipRule} from 'app/actionCreators/modal';
77
import {t} from 'app/locale';
88
import Access from 'app/components/acl/access';
9-
import ActorAvatar from 'app/components/actorAvatar';
9+
import ActorAvatar from 'app/components/avatar/actorAvatar';
1010
import Button from 'app/components/button';
1111
import GuideAnchor from 'app/components/assistant/guideAnchor';
1212
import SentryTypes from 'app/sentryTypes';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import createReactClass from 'create-react-class';
55

66
import {Panel, PanelBody} from 'app/components/panels';
77
import withApi from 'app/utils/withApi';
8-
import CompactIssue from 'app/components/compactIssue';
8+
import CompactIssue from 'app/components/issues/compactIssue';
99
import EmptyMessage from 'app/views/settings/components/emptyMessage';
1010
import LoadingError from 'app/components/loadingError';
1111
import LoadingIndicator from 'app/components/loadingIndicator';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {alertHighlight, pulse} from 'app/styles/animations';
1111
import Button from 'app/components/button';
1212
import ConfigStore from 'app/stores/configStore';
1313
import InlineSvg from 'app/components/inlineSvg';
14-
import BookmarkStar from 'app/components/bookmarkStar';
14+
import BookmarkStar from 'app/components/projects/bookmarkStar';
1515
import DropdownAutoComplete from 'app/components/dropdownAutoComplete';
1616
import GlobalSelectionHeaderRow from 'app/components/globalSelectionHeaderRow';
1717
import Highlight from 'app/components/highlight';

src/sentry/static/sentry/app/routes.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import OrganizationStreamOverview from 'app/views/organizationStream/overview';
2323
import ProjectChooser from 'app/views/projectChooser';
2424
import ProjectDataForwarding from 'app/views/projectDataForwarding';
2525
import ProjectDebugFiles from 'app/views/projectDebugFiles';
26-
import ProjectEnvironments from 'app/views/projectEnvironments';
2726
import ProjectEventRedirect from 'app/views/projectEventRedirect';
2827
import ProjectGettingStarted from 'app/views/projectInstall/gettingStarted';
2928
import ProjectInstallOverview from 'app/views/projectInstall/overview';
@@ -275,7 +274,10 @@ function routes() {
275274
<Route
276275
name="Environments"
277276
path="environments/"
278-
component={errorHandler(ProjectEnvironments)}
277+
componentPromise={() =>
278+
import(/* webpackChunkName: "ProjectEnvironments" */ './views/settings/project/projectEnvironments')
279+
}
280+
component={errorHandler(LazyLoad)}
279281
>
280282
<IndexRoute />
281283
<Route path="hidden/" />

src/sentry/static/sentry/app/views/organizationProjectsDashboard/projectCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Reflux from 'reflux';
66
import createReactClass from 'create-react-class';
77
import styled from 'react-emotion';
88

9-
import BookmarkStar from 'app/components/bookmarkStar';
9+
import BookmarkStar from 'app/components/projects/bookmarkStar';
1010
import {Client} from 'app/api';
1111
import {loadStatsForProject} from 'app/actionCreators/projects';
1212
import IdBadge from 'app/components/idBadge';

src/sentry/static/sentry/app/views/projects/projectContext.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import withApi from 'app/utils/withApi';
1313
import LoadingError from 'app/components/loadingError';
1414
import LoadingIndicator from 'app/components/loadingIndicator';
1515
import MemberListStore from 'app/stores/memberListStore';
16-
import MissingProjectMembership from 'app/components/missingProjectMembership';
16+
import MissingProjectMembership from 'app/components/projects/missingProjectMembership';
1717
import ProjectsStore from 'app/stores/projectsStore';
1818
import SentryTypes from 'app/sentryTypes';
1919
import withProjects from 'app/utils/withProjects';

src/sentry/static/sentry/app/views/settings/components/settingsProjectItem.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import styled from 'react-emotion';
22
import React from 'react';
33
import createReactClass from 'create-react-class';
44

5-
import BookmarkStar from 'app/components/bookmarkStar';
5+
import BookmarkStar from 'app/components/projects/bookmarkStar';
66
import Link from 'app/components/links/link';
77
import ProjectLabel from 'app/components/projectLabel';
88
import SentryTypes from 'app/sentryTypes';

src/sentry/static/sentry/app/views/settings/project/projectOwnership/selectOwners.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import ProjectsStore from 'app/stores/projectsStore';
1515
import TeamStore from 'app/stores/teamStore';
1616
import IdBadge from 'app/components/idBadge';
1717
import MultiSelectControl from 'app/components/forms/multiSelectControl';
18-
import ActorAvatar from 'app/components/actorAvatar';
18+
import ActorAvatar from 'app/components/avatar/actorAvatar';
1919
import SentryTypes from 'app/sentryTypes';
2020
import Button from 'app/components/button';
2121
import InlineSvg from 'app/components/inlineSvg';

src/sentry/static/sentry/app/views/userFeedback/organizationUserFeedback.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import styled from 'react-emotion';
44
import {PageContent} from 'app/styles/organization';
55
import {t} from 'app/locale';
66
import AsyncView from 'app/views/asyncView';
7-
import CompactIssue from 'app/components/compactIssue';
7+
import CompactIssue from 'app/components/issues/compactIssue';
88
import EmptyStateWarning from 'app/components/emptyStateWarning';
99
import EventUserFeedback from 'app/components/events/userFeedback';
1010
import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';

tests/js/spec/components/actorAvatar.spec.jsx renamed to tests/js/spec/components/avatar/actorAvatar.spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import {shallow, mount} from 'enzyme';
3-
import ActorAvatar from 'app/components/actorAvatar';
3+
import ActorAvatar from 'app/components/avatar/actorAvatar';
44
import MemberListStore from 'app/stores/memberListStore';
55
import TeamStore from 'app/stores/teamStore';
66

tests/js/spec/components/__snapshots__/bookmarkStar.spec.jsx.snap renamed to tests/js/spec/components/projects/__snapshots__/bookmarkStar.spec.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ exports[`BookmarkStar renders 1`] = `
9292
src="icon-star-small-filled"
9393
>
9494
<InlineSvg
95-
className="css-fl9x15-Star e1urz3930"
95+
className="css-fl9x15-Star e5ekdrk0"
9696
isBookmarked={false}
9797
onClick={[Function]}
9898
src="icon-star-small-filled"
9999
>
100100
<StyledSvg
101-
className="css-fl9x15-Star e1urz3930"
101+
className="css-fl9x15-Star e5ekdrk0"
102102
height="1em"
103103
isBookmarked={false}
104104
onClick={[Function]}
105105
viewBox={Object {}}
106106
width="1em"
107107
>
108108
<svg
109-
className="e1urz3930 css-1b9wx8m-StyledSvg-Star e2idor0"
109+
className="e5ekdrk0 css-1b9wx8m-StyledSvg-Star e2idor0"
110110
height="1em"
111111
onClick={[Function]}
112112
viewBox={Object {}}

tests/js/spec/components/bookmarkStar.spec.jsx renamed to tests/js/spec/components/projects/bookmarkStar.spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {mount} from 'enzyme';
22
import React from 'react';
33

4-
import BookmarkStar from 'app/components/bookmarkStar';
4+
import BookmarkStar from 'app/components/projects/bookmarkStar';
55

66
describe('BookmarkStar', function() {
77
let wrapper, projectMock;

tests/js/spec/views/__snapshots__/organizationTeamProjects.spec.jsx.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,21 +519,21 @@ exports[`OrganizationTeamProjects Should render 1`] = `
519519
src="icon-star-small-filled"
520520
>
521521
<InlineSvg
522-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
522+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
523523
isBookmarked={false}
524524
onClick={[Function]}
525525
src="icon-star-small-filled"
526526
>
527527
<StyledSvg
528-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
528+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
529529
height="1em"
530530
isBookmarked={false}
531531
onClick={[Function]}
532532
viewBox={Object {}}
533533
width="1em"
534534
>
535535
<svg
536-
className="enngb6z1 e1urz3930 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
536+
className="enngb6z1 e5ekdrk0 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
537537
height="1em"
538538
onClick={[Function]}
539539
viewBox={Object {}}
@@ -907,21 +907,21 @@ exports[`OrganizationTeamProjects Should render 1`] = `
907907
src="icon-star-small-filled"
908908
>
909909
<InlineSvg
910-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
910+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
911911
isBookmarked={false}
912912
onClick={[Function]}
913913
src="icon-star-small-filled"
914914
>
915915
<StyledSvg
916-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
916+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
917917
height="1em"
918918
isBookmarked={false}
919919
onClick={[Function]}
920920
viewBox={Object {}}
921921
width="1em"
922922
>
923923
<svg
924-
className="enngb6z1 e1urz3930 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
924+
className="enngb6z1 e5ekdrk0 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
925925
height="1em"
926926
onClick={[Function]}
927927
viewBox={Object {}}

tests/js/spec/views/organizationProjectsDashboard/__snapshots__/projectCard.spec.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,21 +537,21 @@ exports[`ProjectCard renders 1`] = `
537537
src="icon-star-small-filled"
538538
>
539539
<InlineSvg
540-
className="css-fl9x15-Star e1urz3930"
540+
className="css-fl9x15-Star e5ekdrk0"
541541
isBookmarked={false}
542542
onClick={[Function]}
543543
src="icon-star-small-filled"
544544
>
545545
<StyledSvg
546-
className="css-fl9x15-Star e1urz3930"
546+
className="css-fl9x15-Star e5ekdrk0"
547547
height="1em"
548548
isBookmarked={false}
549549
onClick={[Function]}
550550
viewBox={Object {}}
551551
width="1em"
552552
>
553553
<svg
554-
className="e1urz3930 css-1b9wx8m-StyledSvg-Star e2idor0"
554+
className="e5ekdrk0 css-1b9wx8m-StyledSvg-Star e2idor0"
555555
height="1em"
556556
onClick={[Function]}
557557
viewBox={Object {}}

tests/js/spec/views/settings/__snapshots__/organizationProjects.spec.jsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,21 +571,21 @@ exports[`OrganizationProjects Should render the projects in the store 1`] = `
571571
src="icon-star-small-filled"
572572
>
573573
<InlineSvg
574-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
574+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
575575
isBookmarked={false}
576576
onClick={[Function]}
577577
src="icon-star-small-filled"
578578
>
579579
<StyledSvg
580-
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e1urz3930"
580+
className="enngb6z1 css-1j5sthu-Star-BookmarkLink e5ekdrk0"
581581
height="1em"
582582
isBookmarked={false}
583583
onClick={[Function]}
584584
viewBox={Object {}}
585585
width="1em"
586586
>
587587
<svg
588-
className="enngb6z1 e1urz3930 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
588+
className="enngb6z1 e5ekdrk0 css-85qks9-StyledSvg-Star-BookmarkLink e2idor0"
589589
height="1em"
590590
onClick={[Function]}
591591
viewBox={Object {}}

tests/js/spec/views/__snapshots__/projectEnvironments.spec.jsx.snap renamed to tests/js/spec/views/settings/__snapshots__/projectEnvironments.spec.jsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,15 +1326,15 @@ exports[`ProjectEnvironments render hidden renders environment list 1`] = `
13261326
size="xsmall"
13271327
>
13281328
<Button
1329-
className="css-10adnmx-EnvironmentButton ezuela50"
1329+
className="css-10adnmx-EnvironmentButton e1pnz46f0"
13301330
disabled={false}
13311331
onClick={[Function]}
13321332
size="xsmall"
13331333
>
13341334
<StyledButton
13351335
aria-disabled={false}
13361336
aria-label="Show"
1337-
className="css-10adnmx-EnvironmentButton ezuela50"
1337+
className="css-10adnmx-EnvironmentButton e1pnz46f0"
13381338
disabled={false}
13391339
onClick={[Function]}
13401340
role="button"
@@ -1343,7 +1343,7 @@ exports[`ProjectEnvironments render hidden renders environment list 1`] = `
13431343
<ForwardRef
13441344
aria-disabled={false}
13451345
aria-label="Show"
1346-
className="ezuela50 css-1b2zh6x-StyledButton-getColors-EnvironmentButton e12ma6z0"
1346+
className="e1pnz46f0 css-1b2zh6x-StyledButton-getColors-EnvironmentButton e12ma6z0"
13471347
disabled={false}
13481348
onClick={[Function]}
13491349
role="button"
@@ -1352,7 +1352,7 @@ exports[`ProjectEnvironments render hidden renders environment list 1`] = `
13521352
<button
13531353
aria-disabled={false}
13541354
aria-label="Show"
1355-
className="ezuela50 css-1b2zh6x-StyledButton-getColors-EnvironmentButton e12ma6z0"
1355+
className="e1pnz46f0 css-1b2zh6x-StyledButton-getColors-EnvironmentButton e12ma6z0"
13561356
onClick={[Function]}
13571357
role="button"
13581358
size="xsmall"

tests/js/spec/views/projectEnvironments.spec.jsx renamed to tests/js/spec/views/settings/projectEnvironments.spec.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import {mount} from 'enzyme';
33

44
import EnvironmentStore from 'app/stores/environmentStore';
5-
import ProjectEnvironments from 'app/views/projectEnvironments';
5+
import ProjectEnvironments from 'app/views/settings/project/projectEnvironments';
66
import recreateRoute from 'app/utils/recreateRoute';
77
import {ALL_ENVIRONMENTS_KEY} from 'app/constants';
88

0 commit comments

Comments
 (0)