Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 469
🚨2️⃣[ORG-59] List invitations in <OrganizationSwitcher />#1554
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d86bcc3
feat(clerk-js): Load invitation with infinite scrolling
panteliselef f8cea98
chore(clerk-js): Custom useInView
panteliselef 8cc775c
feat(localizations): New invitation Org switcher keys
panteliselef 921c927
feat(clerk-js,types): Users can accept invitations within <Organizati…
panteliselef 4183171
fix(clerk-js,types): UserOrganizationInvitation nullish slug
panteliselef 9eb5002
fix(clerk-js): Update OrganizationPreviewProps to accept only the pub…
panteliselef fc728f3
test(clerk-js): Display list of invitation in OrganizationSwitcher
panteliselef c88d608
chore(repo): Add changeset
panteliselef da4becd
chore(clerk-js): Move useInView inside `/hooks`
panteliselef 736b06f
chore(clerk-js): Fix minor discrepancies
panteliselef 386ce2e
chore(clerk-js): Split `OrganizationActionList` into smaller components
panteliselef File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
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,8 @@ | ||
| --- | ||
| '@clerk/localizations': patch | ||
| '@clerk/clerk-js': patch | ||
| '@clerk/types': patch | ||
| --- | ||
| Introduces an invitation list within <OrganizationSwitcher/> | ||
| + Users can accept the invitation that is sent to them |
8 changes: 7 additions & 1 deletion
8 packages/clerk-js/src/ui/components/OrganizationSwitcher/OrganizationSwitcher.tsx
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
87 changes: 23 additions & 64 deletions
87 packages/clerk-js/src/ui/components/OrganizationSwitcher/OtherOrganizationActions.tsx
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
155 changes: 155 additions & 0 deletions
155 packages/clerk-js/src/ui/components/OrganizationSwitcher/UserInvitationList.tsx
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,155 @@ | ||
| import type { UserOrganizationInvitationResource } from '@clerk/types'; | ||
| import { useCoreOrganizationList } from '../../contexts'; | ||
| import { Box, Button, descriptors, Flex, localizationKeys, Spinner, Text } from '../../customizables'; | ||
| import { OrganizationPreview, useCardState, withCardStateProvider } from '../../elements'; | ||
| import { useInView } from '../../hooks'; | ||
| import { common } from '../../styledSystem'; | ||
| import { handleError } from '../../utils'; | ||
| export const UserInvitationList = () => { | ||
| const { ref } = useInView({ | ||
| threshold: 0, | ||
| onChange: inView => { | ||
| if (inView) { | ||
| userInvitations.fetchNext?.(); | ||
| } | ||
| }, | ||
| }); | ||
| const { userInvitations } = useCoreOrganizationList({ | ||
| userInvitations: { | ||
| infinite: true, | ||
| }, | ||
| }); | ||
| if ((userInvitations.count ?? 0) === 0) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <Flex | ||
| direction='col' | ||
| elementDescriptor={descriptors.organizationSwitcherPopoverInvitationActions} | ||
| > | ||
| <Text | ||
| variant='smallRegular' | ||
| sx={t => ({ | ||
| minHeight: 'unset', | ||
| height: t.space.$12, | ||
| padding: `${t.space.$3} ${t.space.$6}`, | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| })} | ||
| // Handle plurals | ||
| localizationKey={localizationKeys( | ||
| (userInvitations.count ?? 0) > 1 | ||
| ? 'organizationSwitcher.invitationCountLabel_many' | ||
| : 'organizationSwitcher.invitationCountLabel_single', | ||
| { | ||
| count: userInvitations.count, | ||
| }, | ||
| )} | ||
| /> | ||
| <Box | ||
| sx={t => ({ | ||
| maxHeight: `calc(4 * ${t.sizes.$12})`, | ||
| overflowY: 'auto', | ||
| ...common.unstyledScrollbar(t), | ||
| })} | ||
| > | ||
| {userInvitations?.data?.map(inv => { | ||
| return ( | ||
| <InvitationPreview | ||
| key={inv.id} | ||
| {...inv} | ||
| /> | ||
| ); | ||
| })} | ||
| {(userInvitations.hasNextPage || userInvitations.isFetching) && ( | ||
| <Box | ||
| ref={ref} | ||
| sx={t => ({ | ||
| width: '100%', | ||
| height: t.space.$12, | ||
| position: 'relative', | ||
| })} | ||
| > | ||
| <Box | ||
| sx={{ | ||
| margin: 'auto', | ||
| position: 'absolute', | ||
| left: '50%', | ||
| top: '50%', | ||
| transform: 'translateY(-50%) translateX(-50%)', | ||
| }} | ||
| > | ||
| <Spinner | ||
| size='md' | ||
| colorScheme='primary' | ||
| /> | ||
| </Box> | ||
| </Box> | ||
| )} | ||
| </Box> | ||
| </Flex> | ||
| ); | ||
| }; | ||
| const AcceptRejectInvitationButtons = (props: UserOrganizationInvitationResource) => { | ||
| const card = useCardState(); | ||
| const { userInvitations } = useCoreOrganizationList({ | ||
| userInvitations: { | ||
| infinite: true, | ||
| }, | ||
| }); | ||
| const mutateSwrState = () => { | ||
| (userInvitations as any)?.unstable__mutate?.(); | ||
| }; | ||
| const handleAccept = () => { | ||
| return card | ||
| .runAsync(props.accept()) | ||
| .then(mutateSwrState) | ||
| .catch(err => handleError(err, [], card.setError)); | ||
| }; | ||
| return ( | ||
| <> | ||
| <Button | ||
| elementDescriptor={descriptors.organizationSwitcherInvitationAcceptButton} | ||
| textVariant='buttonExtraSmallBold' | ||
| variant='solid' | ||
| isLoading={card.isLoading} | ||
| onClick={handleAccept} | ||
| localizationKey={localizationKeys('organizationSwitcher.invitationAccept')} | ||
| /> | ||
| </> | ||
| ); | ||
| }; | ||
| const InvitationPreview = withCardStateProvider((props: UserOrganizationInvitationResource) => { | ||
| return ( | ||
| <Flex | ||
| align='center' | ||
| gap={2} | ||
| sx={t => ({ | ||
| minHeight: 'unset', | ||
| height: t.space.$12, | ||
| justifyContent: 'space-between', | ||
| padding: `0 ${t.space.$6}`, | ||
| })} | ||
| > | ||
| <OrganizationPreview | ||
| elementId='organizationSwitcher' | ||
| avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })} | ||
| organization={props.publicOrganizationData} | ||
| size='sm' | ||
| /> | ||
| <AcceptRejectInvitationButtons {...props} /> | ||
| </Flex> | ||
| ); | ||
| }); |
73 changes: 73 additions & 0 deletions
73 packages/clerk-js/src/ui/components/OrganizationSwitcher/UserMembershipList.tsx
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,73 @@ | ||
| import type { OrganizationResource } from '@clerk/types'; | ||
| import React from 'react'; | ||
| import { | ||
| useCoreOrganization, | ||
| useCoreOrganizationList, | ||
| useCoreUser, | ||
| useOrganizationSwitcherContext, | ||
| } from '../../contexts'; | ||
| import { Box, descriptors, localizationKeys } from '../../customizables'; | ||
| import { OrganizationPreview, PersonalWorkspacePreview, PreviewButton } from '../../elements'; | ||
| import { SwitchArrows } from '../../icons'; | ||
| import { common } from '../../styledSystem'; | ||
| export type UserMembershipListProps = { | ||
| onPersonalWorkspaceClick: React.MouseEventHandler; | ||
| onOrganizationClick: (org: OrganizationResource) => unknown; | ||
| }; | ||
| export const UserMembershipList = (props: UserMembershipListProps) => { | ||
| const { onPersonalWorkspaceClick, onOrganizationClick } = props; | ||
| const { hidePersonal } = useOrganizationSwitcherContext(); | ||
| const { organization: currentOrg } = useCoreOrganization(); | ||
| const { organizationList } = useCoreOrganizationList(); | ||
| const user = useCoreUser(); | ||
| const otherOrgs = (organizationList || []).map(e => e.organization).filter(o => o.id !== currentOrg?.id); | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| const { username, primaryEmailAddress, primaryPhoneNumber, ...userWithoutIdentifiers } = user; | ||
| return ( | ||
| <Box | ||
| sx={t => ({ | ||
| maxHeight: `calc(4 * ${t.sizes.$12})`, | ||
| overflowY: 'auto', | ||
| ...common.unstyledScrollbar(t), | ||
| })} | ||
| > | ||
| {currentOrg && !hidePersonal && ( | ||
| <PreviewButton | ||
| elementDescriptor={descriptors.organizationSwitcherPreviewButton} | ||
| icon={SwitchArrows} | ||
| sx={{ borderRadius: 0 }} | ||
| onClick={onPersonalWorkspaceClick} | ||
| > | ||
| <PersonalWorkspacePreview | ||
| user={userWithoutIdentifiers} | ||
| size='sm' | ||
| avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })} | ||
| title={localizationKeys('organizationSwitcher.personalWorkspace')} | ||
| /> | ||
| </PreviewButton> | ||
| )} | ||
| {otherOrgs.map(organization => ( | ||
| <PreviewButton | ||
| key={organization.id} | ||
| elementDescriptor={descriptors.organizationSwitcherPreviewButton} | ||
| icon={SwitchArrows} | ||
| sx={{ borderRadius: 0 }} | ||
| onClick={() => onOrganizationClick(organization)} | ||
| > | ||
| <OrganizationPreview | ||
| elementId='organizationSwitcher' | ||
| avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })} | ||
| organization={organization} | ||
| size='sm' | ||
| /> | ||
| </PreviewButton> | ||
| ))} | ||
| </Box> | ||
| ); | ||
| }; |
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.