Skip to content

Fix intermittent blank page and profile setup redirect loop #11788

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
nbudin merged 2 commits into from
Jun 30, 2026
Merged

Fix intermittent blank page and profile setup redirect loop #11788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc5afa
Fix intermittent blank page on initial app load
nbudin Jun 30, 2026
fa2e84f
Fix redirect loop after new user profile setup
nbudin Jun 30, 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
2 changes: 1 addition & 1 deletion app/graphql/graphql_operations_generated.json
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions app/javascript/MyProfile/MyProfileForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Link,
LoaderFunction,
SubmitTarget,
redirect,
useFetcher,
useLoaderData,
useMatch,
Expand Down Expand Up @@ -31,7 +32,9 @@ import { AuthenticityTokensContext } from 'AuthenticityTokensContext';

export const action: ActionFunction<RouterContextProvider> = async ({ request, context }) => {
const client = context.get(apolloClientContext);
const profile = (await request.json()) as LoaderResult['initialUserConProfile'];
const { _redirectTo, ...profile } = (await request.json()) as LoaderResult['initialUserConProfile'] & {
_redirectTo?: string;
};

try {
await client.mutate({
Expand All @@ -50,6 +53,7 @@ export const action: ActionFunction<RouterContextProvider> = async ({ request, c
refetchQueries: [{ query: MyProfileQueryDocument }],
});

if (_redirectTo) return redirect(_redirectTo);
return null;
} catch (e) {
return parseResponseErrors(e, ['updateUserConProfile']);
Expand Down Expand Up @@ -225,9 +229,22 @@ function MyProfileForm() {
</div>
<div className="my-4 d-flex align-items-center">
{initialSetup ? (
<Link to="/" className="btn btn-primary">
<button
className="btn btn-primary"
disabled={mutationInProgress}
onClick={() => {
// Explicitly submit the current profile so UpdateUserConProfile sets
// needs_update=false in DB and cache, then redirect to /. Without this,
// clicking Finish without changing anything would leave needs_update=true
// and cause appRootLoader to redirect back to /my_profile/setup.
fetcher.submit({ ...userConProfile, _redirectTo: '/' } as SubmitTarget, {
method: 'PATCH',
encType: 'application/json',
});
}}
>
{t('myProfile.initialSetupFinishButton')}
</Link>
</button>
) : (
<Link to="/my_profile" className="btn btn-primary">
{t('myProfile.profileEditFinishButton')}
Expand Down
Loading
Loading