Skip to content
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.

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

ref(sentry10): Remove non Sentry 10 paths from group details #13635

Merged
merged 1 commit into from
Jun 12, 2019
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
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,13 @@ const GroupDetails = createReactClass({
},

renderContent(shouldShowGlobalHeader) {
const {params, environments} = this.props;
const {environments} = this.props;
const {group, project} = this.state;

const Content = (
<DocumentTitle title={this.getTitle()}>
<div className={this.props.className}>
<GroupHeader params={params} project={project} group={group} />
<GroupHeader project={project} group={group} />
{React.cloneElement(this.props.children, {
environments,
group,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ const GroupGroupingView = createReactClass({
} else if (mergedParent && mergedParent !== this.props.params.groupId) {
const {params} = this.props;
// Merge success, since we can't specify target, we need to redirect to new parent
const baseUrl = params.projectId
? `/${params.orgId}/${params.projectId}/issues/`
: `/organizations/${params.orgId}/issues/`;
browserHistory.push(`${baseUrl}${mergedParent}/similar/`);
browserHistory.push(
`/organizations/${params.orgId}/issues/${mergedParent}/similar/`
);
}
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class GroupTags extends React.Component {
organization: SentryTypes.Organization.isRequired,
group: SentryTypes.Group.isRequired,
api: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
};

constructor() {
Expand Down Expand Up @@ -65,13 +64,11 @@ class GroupTags extends React.Component {
}

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

let children = [];

const baseUrl = params.projectId
? `/${organization.slug}/${group.project.slug}/issues/`
: `/organizations/${organization.slug}/issues/`;
const baseUrl = `/organizations/${organization.slug}/issues/`;

if (this.state.loading) {
return <LoadingIndicator />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const GroupHeader = createReactClass({
api: PropTypes.object,
group: SentryTypes.Group.isRequired,
project: SentryTypes.Project,
params: PropTypes.object,
},

contextTypes: {
Expand Down Expand Up @@ -91,7 +90,7 @@ const GroupHeader = createReactClass({
},

render() {
const {project, group, params} = this.props;
const {project, group} = this.props;
const projectFeatures = new Set(project ? project.features : []);
const userCount = group.userCount;

Expand All @@ -118,9 +117,7 @@ const GroupHeader = createReactClass({

const hasSimilarView = projectFeatures.has('similarity-view');

const baseUrl = params.projectId
? `/${orgId}/${params.projectId}/issues/`
: `/organizations/${orgId}/issues/`;
const baseUrl = `/organizations/${orgId}/issues/`;

const searchTermWithoutQuery = omit(location.query, 'query');
const eventRouteToObject = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ describe('Issues Similar View', function() {
);

expect(browserHistory.push).toHaveBeenCalledWith(
'/org-slug/project-slug/issues/321/similar/'
'/organizations/org-slug/issues/321/similar/'
);
});
});