Skip to content

Commit aa73ba5

Browse files
ref(browserHistory): Remove from teamSettings (#82736)
1 parent 8e0a64b commit aa73ba5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

static/app/views/settings/organizationTeams/teamSettings/index.spec.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ describe('TeamSettings', function () {
5757
);
5858

5959
await waitFor(() =>
60-
expect(router.replace).toHaveBeenCalledWith(
61-
'/settings/org-slug/teams/new-slug/settings/'
62-
)
60+
expect(router.replace).toHaveBeenCalledWith({
61+
pathname: '/settings/org-slug/teams/new-slug/settings/',
62+
})
6363
);
6464
});
6565

@@ -102,7 +102,7 @@ describe('TeamSettings', function () {
102102
);
103103

104104
await waitFor(() =>
105-
expect(router.replace).toHaveBeenCalledWith('/settings/org-slug/teams/')
105+
expect(router.replace).toHaveBeenCalledWith({pathname: '/settings/org-slug/teams/'})
106106
);
107107

108108
expect(TeamStore.getAll()).toEqual([]);

static/app/views/settings/organizationTeams/teamSettings/index.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ import {IconDelete} from 'sentry/icons';
2020
import {t, tct} from 'sentry/locale';
2121
import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
2222
import type {Team} from 'sentry/types/organization';
23-
import {browserHistory} from 'sentry/utils/browserHistory';
24-
import normalizeUrl from 'sentry/utils/url/normalizeUrl';
2523
import useApi from 'sentry/utils/useApi';
24+
import {useNavigate} from 'sentry/utils/useNavigate';
2625
import useOrganization from 'sentry/utils/useOrganization';
2726
import PermissionAlert from 'sentry/views/settings/project/permissionAlert';
2827

@@ -31,6 +30,7 @@ interface TeamSettingsProps extends RouteComponentProps<{teamId: string}, {}> {
3130
}
3231

3332
function TeamSettings({team, params}: TeamSettingsProps) {
33+
const navigate = useNavigate();
3434
const organization = useOrganization();
3535
const api = useApi();
3636

@@ -40,16 +40,16 @@ function TeamSettings({team, params}: TeamSettingsProps) {
4040
updateTeamSuccess(team.slug, resp);
4141
if (id === 'slug') {
4242
addSuccessMessage(t('Team name changed'));
43-
browserHistory.replace(
44-
normalizeUrl(`/settings/${organization.slug}/teams/${resp.slug}/settings/`)
45-
);
43+
navigate(`/settings/${organization.slug}/teams/${resp.slug}/settings/`, {
44+
replace: true,
45+
});
4646
}
4747
};
4848

4949
const handleRemoveTeam = async () => {
5050
try {
5151
await removeTeam(api, {orgId: organization.slug, teamId: params.teamId});
52-
browserHistory.replace(normalizeUrl(`/settings/${organization.slug}/teams/`));
52+
navigate(`/settings/${organization.slug}/teams/`, {replace: true});
5353
} catch {
5454
// removeTeam already displays an error message
5555
}

0 commit comments

Comments
 (0)