Uh oh!
There was an error while loading. Please reload this page.
fix(ui): keep ConfigureSSO wizard mounted while security page data refetches - #8999
Merged
Conversation
🦋 Changeset detectedLatest commit: 062fab0 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Repository UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (2)
📝 WalkthroughWalkthroughUpdates ChangesOrganization security wizard loading
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
Comment |
@clerk/astro@clerk/backend@clerk/chrome-extension@clerk/clerk-js@clerk/electron@clerk/electron-passkeys@clerk/eslint-plugin@clerk/expo@clerk/expo-passkeys@clerk/express@clerk/fastify@clerk/hono@clerk/localizations@clerk/nextjs@clerk/nuxt@clerk/react@clerk/react-router@clerk/shared@clerk/tanstack-react-start@clerk/testing@clerk/ui@clerk/upgrade@clerk/vuecommit: |
iagodahlemforce-pushed
the
iago/sso-wizard-loading-unmount
branch
from
June 25, 2026 17:45
e13619c to
67ba152Compareiagodahlem
marked this pull request as ready for review
June 25, 2026 17:50
Contributor
API Changes Report
Summary
No API Changes DetectedAll packages have stable APIs with no detected changes. Report generated by Break Check Last ran on |
…fetches The organization Security page short-circuited to a page-level loading overview whenever its enterprise-connection data was loading, regardless of whether the SSO configuration wizard was open. When a background refetch flipped the loading flag mid-configuration (for example the test-runs query cold-loading right after the connection is configured), the open wizard unmounted and, on remount, reseated to its initial step — dropping the user back to the Domains or Test step and losing their place. Scope the loading overview to the overview view only. Once the wizard is open the connection data is already present and stays warm, and each wizard step renders its own loading state, so a transient refetch no longer tears the wizard down. Adds a regression test that drives the wizard to a later step and asserts it stays put across a loading toggle.
iagodahlemforce-pushed
the
iago/sso-wizard-loading-unmount
branch
from
June 25, 2026 17:54
67ba152 to
062fab0CompareLauraBeatris
approved these changes
Jun 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Fixes the self-serve SSO configuration wizard jumping back to an earlier step after you submit a step's configuration.
On
<OrganizationProfile />→ Security,OrganizationSecurityPagereturns a page-level loading overview wheneverisLoadingis true, and that early-return sits above the overview-vs-wizard branch. So a background refetch that flipsisLoadingtrue while the wizard is open unmounts the open<ConfigureSSO />wizard and re-mounts it at its seed step (the first step, or the furthest-reachable step) — losing the user's place.isLoadingincludes(hadInitialConnection && isLoadingTestRuns). Submitting a configure step (e.g. saving an identity provider's metadata) marks the connection configured, which activates the test-runs query; the first time it cold-loads,isLoadingflips and the open wizard is torn down. Reported during GA testing on Google Workspace and Okta — intermittent, because a second attempt finds the test-runs already cached.Fix
Scope the page-level loading overview to the overview view only (
isLoading && view === 'overview'), so a background refetch can no longer unmount an open wizard. The wizard is only ever opened from the overview after the initial load has settled, the connection data stays warm viakeepPreviousData, and each wizard step owns its own loading UI — so the page-level skeleton is unnecessary once the wizard is open.Test
Adds a regression test that drives the wizard to a non-initial step, toggles
isLoadingtrue → false, and asserts the wizard stays on its current step. It fails on the previous behavior (the wizard reseats to the first step) and passes with this change.Follow-up (separate)
The test-runs query should be made strictly table-level so it never feeds the page-level
isLoadingafter the initial page load (also flagged in the wizard-refactor review for the pagination path). Out of scope here to keep this fix minimal for GA.ORGS-1694
Summary by CodeRabbit