Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/sentry/static/sentry/app/components/groupList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ const GroupList = createReactClass({
key={id}
id={id}
orgId={orgId}
projectId={project.slug}
canSelect={this.props.canSelectGroups}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions src/sentry/static/sentry/app/components/stream/group.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const StreamGroup = createReactClass({
propTypes: {
id: PropTypes.string.isRequired,
orgId: PropTypes.string.isRequired,
projectId: PropTypes.string.isRequired,
statsPeriod: PropTypes.string.isRequired,
canSelect: PropTypes.bool,
query: PropTypes.string,
Expand Down Expand Up @@ -87,7 +86,8 @@ const StreamGroup = createReactClass({

render() {
const {data} = this.state;
const {id, orgId, projectId, query, hasGuideAnchor, canSelect} = this.props;
const {id, orgId, query, hasGuideAnchor, canSelect} = this.props;
const projectId = data.project.slug;

return (
<Group onClick={this.toggleSelect} py={1} px={0} align="center">
Expand Down
49 changes: 26 additions & 23 deletions src/sentry/static/sentry/app/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ function routes() {
<Route path="/:orgId/" component={errorHandler(OrganizationDetails)}>
<Route component={errorHandler(OrganizationRoot)}>
<IndexRoute component={errorHandler(OrganizationDashboard)} />

<Route
path="/organizations/:orgId/dashboards/"
componentPromise={() =>
Expand All @@ -767,7 +766,6 @@ function routes() {
component={errorHandler(LazyLoad)}
/>
</Route>

<Route
path="/organizations/:orgId/discover/"
componentPromise={() =>
Expand All @@ -777,12 +775,10 @@ function routes() {
<Redirect path="saved/" to="/organizations/:orgId/discover/" />
<Route path="saved/:savedQueryId/" />
</Route>

<Route
path="/organizations/:orgId/activity/"
component={errorHandler(OrganizationActivity)}
/>

Copy link
Member Author

Choose a reason for hiding this comment

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

Prettier doing its thing 🤷‍♂️

<Route
path="/organizations/:orgId/events/"
componentPromise={() =>
Expand All @@ -795,14 +791,38 @@ function routes() {
component={errorHandler(LazyLoad)}
/>
</Route>

<Route
path="/organizations/:orgId/issues/"
componentPromise={() =>
import(/* webpackChunkName: "OrganizationStreamContainer" */ './views/organizationStream/container')}
component={errorHandler(LazyLoad)}
>
<IndexRoute
componentPromise={() =>
import(/* webpackChunkName: "OrganizationStreamOverview" */ './views/organizationStream/overview')}
Copy link
Member

Choose a reason for hiding this comment

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

I think the name is good - Is the stream something we'll want to keep codesplit once it's live on prod? We probably want it in the main bundle (and codesplit the older stream).

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah once org issues are out they should probably join the main bundle but for now I didn't want to bog down customers with code they won't use. I added APP-992 to track the removal of the code split.

component={errorHandler(LazyLoad)}
/>
</Route>
{/* Once org issues is complete, these routes can be nested under
/organizations/:orgId/issues */}
<Route
path="/organizations/:orgId/issues/assigned/"
component={errorHandler(MyIssuesAssignedToMe)}
/>
<Route
path="/organizations/:orgId/issues/bookmarks/"
component={errorHandler(MyIssuesBookmarked)}
/>
<Route
path="/organizations/:orgId/issues/history/"
component={errorHandler(MyIssuesViewed)}
/>
<Route
path="/organizations/:orgId/user-feedback/"
componentPromise={() =>
import(/* webpackChunkName: "OrganizationUserFeedback" */ './views/userFeedback/organizationUserFeedback')}
component={errorHandler(LazyLoad)}
/>

<Route
path="/organizations/:orgId/releases/"
componentPromise={() =>
Expand All @@ -821,14 +841,12 @@ function routes() {
component={errorHandler(LazyLoad)}
/>
</Route>

<Route
path="/organizations/:orgId/teams/new/"
componentPromise={() =>
import(/* webpackChunkName: "TeamCreate" */ './views/teamCreate')}
component={errorHandler(LazyLoad)}
/>

<Route path="/organizations/:orgId/" component={OrganizationHomeContainer}>
<Redirect from="projects/" to="/:orgId/" />
{hooksOrgRoutes}
Expand Down Expand Up @@ -861,25 +879,10 @@ function routes() {
<Redirect path="repos/" to="/settings/:orgId/repos/" />
<Route path="stats/" component={errorHandler(OrganizationStats)} />
</Route>

<Route
path="/organizations/:orgId/issues/assigned/"
component={errorHandler(MyIssuesAssignedToMe)}
/>
<Route
path="/organizations/:orgId/issues/bookmarks/"
component={errorHandler(MyIssuesBookmarked)}
/>
<Route
path="/organizations/:orgId/issues/history/"
component={errorHandler(MyIssuesViewed)}
/>

<Route
path="/organizations/:orgId/projects/new/"
component={errorHandler(NewProject)}
/>

<Route
path="/organizations/:orgId/projects/choose/"
component={errorHandler(ProjectChooser)}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import {withRouter} from 'react-router';
import React from 'react';

import {HeaderTitle, PageContent, PageHeader} from 'app/styles/organization';
import {t} from 'app/locale';
import Feature from 'app/components/acl/feature';
import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';
import SentryTypes from 'app/sentryTypes';
import withOrganization from 'app/utils/withOrganization';

class OrganizationStreamContainer extends React.Component {
static propTypes = {
organization: SentryTypes.Organization,
};

render() {
const {organization, children} = this.props;

return (
<Feature features={['sentry10']} renderDisabled>
<GlobalSelectionHeader organization={organization} />

<PageContent>
<PageHeader>
<HeaderTitle>{t('Issues')}</HeaderTitle>
</PageHeader>

{children}
</PageContent>
</Feature>
);
}
}
export default withRouter(withOrganization(OrganizationStreamContainer));
export {OrganizationStreamContainer};
Loading