Skip to content

ref(routes): Fix legacy /:orgId redirects #28918

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.

Sign up for GitHub

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

Merged
evanpurkhiser merged 1 commit into from
Sep 28, 2021
Merged

ref(routes): Fix legacy /:orgId redirects #28918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions static/app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,7 @@ function routes() {

const legacyRedirectRoutes = (
<Route path="/:orgId/">
<IndexRedirect to="/organizations/:orgId/" />
<Route path=":projectId/settings/">
<Redirect from="teams/" to="/settings/:orgId/projects/:projectId/teams/" />
<Redirect from="alerts/" to="/settings/:orgId/projects/:projectId/alerts/" />
Expand Down
12 changes: 1 addition & 11 deletions static/app/views/organizationDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Fragment} from 'react';
import {browserHistory, RouteComponentProps} from 'react-router';
import {RouteComponentProps} from 'react-router';

import {switchOrganization} from 'app/actionCreators/organizations';
import AlertActions from 'app/actions/alertActions';
Expand All @@ -12,7 +12,6 @@ import {Body, Main} from 'app/components/layouts/thirds';
import {IconWarning} from 'app/icons';
import {t, tct} from 'app/locale';
import {Organization} from 'app/types';
import getRouteStringFromRoutes from 'app/utils/getRouteStringFromRoutes';
import withOrganization from 'app/utils/withOrganization';
import OrganizationContextContainer from 'app/views/organizationContext';

Expand Down Expand Up @@ -156,15 +155,6 @@ const OrganizationDetailsBody = withOrganization(function OrganizationDetailsBod
type Props = RouteComponentProps<{orgId: string}, {}>;

export default class OrganizationDetails extends Component<Props> {
componentDidMount() {
const {routes} = this.props;
const isOldRoute = getRouteStringFromRoutes(routes) === '/:orgId/';

if (isOldRoute) {
browserHistory.replace(`/organizations/${this.props.params.orgId}/`);
}
}

componentDidUpdate(prevProps: Props) {
if (
prevProps.params &&
Expand Down