fix(clerk-js): Do not display organization list after creating organization throw tasks flow #6117
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@clerk/clerk-js': patch | ||
| --- | ||
|
|
||
| Prevent organization list from displaying after creating an organization through the force organization selection flow |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| import { useOrganizationList } from '@clerk/shared/react/index'; | ||
| import type { PropsWithChildren } from 'react'; | ||
| import { useState } from 'react'; | ||
|
|
||
| import { OrganizationListContext } from '@/ui/contexts'; | ||
| import { Card } from '@/ui/elements/Card'; | ||
| import { useCardState, withCardStateProvider } from '@/ui/elements/contexts'; | ||
|
|
||
| import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables'; | ||
| import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm'; | ||
| import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage'; | ||
| import { organizationListParams } from '../../OrganizationSwitcher/utils'; | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| export const ForceOrganizationSelectionTask = withCardStateProvider(() => { | ||
| const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams); | ||
| const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading; | ||
| const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count); | ||
|
|
||
LauraBeatris marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (isLoading) { | ||
| return ( | ||
| <FlowCard> | ||
| <FlowLoadingState /> | ||
| </FlowCard> | ||
| ); | ||
| } | ||
|
|
||
| if (hasData) { | ||
| return <OrganizationSelectionPage />; | ||
| } | ||
|
|
||
| return <CreateOrganizationPage />; | ||
| }); | ||
|
|
||
| const OrganizationSelectionPage = () => { | ||
| const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false); | ||
|
|
||
| return ( | ||
| <OrganizationListContext.Provider | ||
| value={{ | ||
| componentName: 'OrganizationList', | ||
| skipInvitationScreen: true, | ||
| }} | ||
| > | ||
| <FlowCard> | ||
| {showCreateOrganizationForm ? ( | ||
| <Box | ||
| sx={t => ({ | ||
| padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`, | ||
| })} | ||
| > | ||
| <CreateOrganizationForm | ||
| flow='default' | ||
| startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }} | ||
| skipInvitationScreen | ||
| onCancel={() => setShowCreateOrganizationForm(false)} | ||
| /> | ||
| </Box> | ||
| ) : ( | ||
| <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} /> | ||
| )} | ||
| </FlowCard> | ||
| </OrganizationListContext.Provider> | ||
| ); | ||
| }; | ||
|
|
||
| const CreateOrganizationPage = () => { | ||
| return ( | ||
| <FlowCard> | ||
| <Box | ||
| sx={t => ({ | ||
| padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`, | ||
| })} | ||
| > | ||
| <CreateOrganizationForm | ||
| flow='default' | ||
| startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }} | ||
| skipInvitationScreen | ||
| /> | ||
| </Box> | ||
| </FlowCard> | ||
| ); | ||
| }; | ||
|
|
||
| const FlowCard = ({ children }: PropsWithChildren) => { | ||
| const card = useCardState(); | ||
|
|
||
| return ( | ||
| <Card.Root> | ||
| <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}> | ||
|
There was a problem hiding this comment. We're resetting the padding on the boundaries in order to have the divider:
Otherwise it'd stay like that:
|
||
| <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert> | ||
| {children} | ||
| </Card.Content> | ||
| <Card.Footer /> | ||
| </Card.Root> | ||
| ); | ||
| }; | ||
|
|
||
| const FlowLoadingState = () => ( | ||
| <Flex | ||
| direction='row' | ||
| center | ||
| sx={t => ({ | ||
| height: '100%', | ||
| minHeight: t.sizes.$60, | ||
| })} | ||
|
Comment on lines
+105
to
+108
There was a problem hiding this comment. We need to set a min-height on the loading state while the create organization form isn't rendered. Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the |
||
| > | ||
| <Spinner | ||
| size='xl' | ||
| colorScheme='primary' | ||
| elementDescriptor={descriptors.spinner} | ||
| /> | ||
| </Flex> | ||
| ); | ||
LauraBeatris marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The bundle increased around 4KB since I extracted the force-an-org flow outside of
OrganizationList. It increased the general bundle, but we are lazy loadingSessionTaskswithinSignIn.I think the tradeoff is worth considering. I didn't want to introduce another
if (sessionTasksContext)withinOrganizationListto hijack the logic in there, but rather keep it separate.Ideally, would be nice to use
Suspenseto only download the necessary after-auth steps according toEnviromentsettings.