Skip to content

refactor(onboarding): replace deprecated useRouter with useLocation and useNavigate #115453

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

Open
cursor wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −13
Open

refactor(onboarding): replace deprecated useRouter with useLocation and useNavigate #115453

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
776efb2
refactor: replace deprecated useRouter with useLocation and useNaviga…
cursoragent May 12, 2026
b5e0952
fix: properly narrow query parameter type after useRouter removal
cursoragent May 12, 2026
b7f4a2a
Apply suggestion from @ryan953
ryan953 May 13, 2026
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
32 changes: 19 additions & 13 deletions static/app/components/onboarding/platformOptionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import type {
PlatformOption,
SelectedPlatformOptions,
} from 'sentry/components/onboarding/gettingStartedDoc/types';
import {useRouter} from 'sentry/utils/useRouter';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';

/**
* Hook that returns the currently selected platform option values from the URL
Expand All @@ -17,8 +18,7 @@ import {useRouter} from 'sentry/utils/useRouter';
export function useUrlPlatformOptions<PlatformOptions extends BasePlatformOptions>(
platformOptions?: PlatformOptions
): SelectedPlatformOptions<PlatformOptions> {
const router = useRouter();
const {query} = router.location;
const {query} = useLocation();

return useMemo(() => {
if (!platformOptions) {
Expand All @@ -28,9 +28,11 @@ export function useUrlPlatformOptions<PlatformOptions extends BasePlatformOption
return Object.keys(platformOptions).reduce((acc, key) => {
const defaultValue = platformOptions[key]!.defaultValue;
const values = platformOptions[key]!.items.map(({value}) => value);
acc[key as keyof PlatformOptions] = values.includes(query[key])
? query[key]
: (defaultValue ?? values[0]);
const queryValue = query[key];
acc[key as keyof PlatformOptions] =
typeof queryValue === 'string' && values.includes(queryValue)
? queryValue
: (defaultValue ?? values[0]!);
return acc;
}, {} as SelectedPlatformOptions<PlatformOptions>);
}, [platformOptions, query]);
Expand Down Expand Up @@ -80,18 +82,22 @@ export function PlatformOptionsControl({
platformOptions,
onChange,
}: PlatformOptionsControlProps) {
const router = useRouter();
const location = useLocation();
const navigate = useNavigate();
const urlOptionValues = useUrlPlatformOptions(platformOptions);

const handleChange = (key: string, value: string) => {
onChange?.({[key]: value});
router.replace({
...router.location,
query: {
...router.location.query,
[key]: value,
navigate(
{
...location,
query: {
...location.query,
[key]: value,
},
},
});
{replace: true}
);
};

return (
Expand Down
Loading