-
Notifications
You must be signed in to change notification settings - Fork 252
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(clerk-js,types,localizations): Introduces domains and invitation…
…s in <OrganizationProfile /> (#1560) * feat(localizations,types): Create localization keys for Organization domains * feat(types): Update appearance element keys for Organization domains * feat(clerk-js): Add Verified domains section and all routes to support it + New `/add-domain/` route + New `/verify-domain/:id` route + New `/verified-domain/:id` route * feat(localizations,types): Update localization * chore(clerk-js): Replace ArrowBlockButton with BlockWithAction * feat(clerk-js): Share domain list between members and settings * feat(clerk-js): Create RemoveDomainPage * fix(clerk-js): Rename to `prepareAffiliationVerification` * test(clerk-js): Update OrganizationDomain snapshot * test(clerk-js): Update OrganizationMembers * test(clerk-js): Update OrganizationSettings * chore(clerk-js): Add changeset * chore(clerk-js): Introduce useFetch * chore(clerk-js): Move CalloutWithAction under common ui
- Loading branch information
1 parent
6fe022f
commit 3158752
Showing
25 changed files
with
1,146 additions
and
75 deletions.
There are no files selected for viewing
This file contains 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,10 @@ | ||
--- | ||
'@clerk/localizations': patch | ||
'@clerk/clerk-js': patch | ||
'@clerk/types': patch | ||
--- | ||
|
||
Introduces domains and invitations in <OrganizationProfile /> | ||
|
||
- The "Members" page now accommodates Domain and Individual invitations | ||
- The "Settings" page allows for the addition, edit and removal of a domain |
This file contains 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 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 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,47 @@ | ||
import type { MouseEvent } from 'react'; | ||
|
||
import { Col, Flex, Link, Text } from '../customizables'; | ||
import type { LocalizationKey } from '../localization'; | ||
|
||
type CalloutWithActionProps = { | ||
text: LocalizationKey; | ||
actionLabel?: LocalizationKey; | ||
onClick?: (e: MouseEvent<HTMLAnchorElement>) => Promise<any>; | ||
}; | ||
export const CalloutWithAction = (props: CalloutWithActionProps) => { | ||
const { text, actionLabel, onClick: onClickProp } = props; | ||
|
||
const onClick = (e: MouseEvent<HTMLAnchorElement>) => { | ||
if (onClickProp) { | ||
void onClickProp?.(e); | ||
} | ||
}; | ||
|
||
return ( | ||
<Flex | ||
sx={theme => ({ | ||
background: theme.colors.$blackAlpha50, | ||
padding: theme.space.$4, | ||
justifyContent: 'space-between', | ||
alignItems: 'flex-start', | ||
borderRadius: theme.radii.$md, | ||
})} | ||
> | ||
<Col gap={4}> | ||
<Text | ||
sx={t => ({ | ||
lineHeight: t.lineHeights.$tall, | ||
})} | ||
localizationKey={text} | ||
/> | ||
|
||
<Link | ||
colorScheme={'primary'} | ||
variant='regularMedium' | ||
localizationKey={actionLabel} | ||
onClick={onClick} | ||
/> | ||
</Col> | ||
</Flex> | ||
); | ||
}; |
This file contains 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
62 changes: 62 additions & 0 deletions
62
packages/clerk-js/src/ui/components/OrganizationProfile/AddDomainPage.tsx
This file contains 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,62 @@ | ||
import React from 'react'; | ||
|
||
import { useCoreOrganization } from '../../contexts'; | ||
import { localizationKeys } from '../../customizables'; | ||
import { ContentPage, Form, FormButtons, useCardState, withCardStateProvider } from '../../elements'; | ||
import { useRouter } from '../../router'; | ||
import { handleError, useFormControl } from '../../utils'; | ||
import { OrganizationProfileBreadcrumbs } from './OrganizationProfileNavbar'; | ||
|
||
export const AddDomainPage = withCardStateProvider(() => { | ||
const title = localizationKeys('organizationProfile.createDomainPage.title'); | ||
const subtitle = localizationKeys('organizationProfile.createDomainPage.subtitle'); | ||
const card = useCardState(); | ||
const { organization } = useCoreOrganization(); | ||
const { navigate } = useRouter(); | ||
|
||
const nameField = useFormControl('name', '', { | ||
type: 'text', | ||
label: localizationKeys('formFieldLabel__organizationEmailDomain'), | ||
placeholder: localizationKeys('formFieldInputPlaceholder__organizationName'), | ||
}); | ||
|
||
if (!organization) { | ||
return null; | ||
} | ||
|
||
const canSubmit = organization.name !== nameField.value; | ||
|
||
const onSubmit = (e: React.FormEvent) => { | ||
e.preventDefault(); | ||
return organization | ||
.createDomain(nameField.value) | ||
.then(res => { | ||
if (res.verification && res.verification.status === 'verified') { | ||
return navigate(`../domain/${res.id}`); | ||
} | ||
return navigate(`../domain/${res.id}/verify`); | ||
}) | ||
.catch(err => { | ||
handleError(err, [nameField], card.setError); | ||
}); | ||
}; | ||
|
||
return ( | ||
<ContentPage | ||
headerTitle={title} | ||
headerSubtitle={subtitle} | ||
Breadcrumbs={OrganizationProfileBreadcrumbs} | ||
> | ||
<Form.Root onSubmit={onSubmit}> | ||
<Form.ControlRow elementId={nameField.id}> | ||
<Form.Control | ||
{...nameField.props} | ||
autoFocus | ||
required | ||
/> | ||
</Form.ControlRow> | ||
<FormButtons isDisabled={!canSubmit} /> | ||
</Form.Root> | ||
</ContentPage> | ||
); | ||
}); |
133 changes: 133 additions & 0 deletions
133
packages/clerk-js/src/ui/components/OrganizationProfile/DomainList.tsx
This file contains 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,133 @@ | ||
import type { GetDomainsParams, OrganizationEnrollmentMode } from '@clerk/types'; | ||
import type { OrganizationDomainVerificationStatus } from '@clerk/types'; | ||
import React, { useMemo } from 'react'; | ||
|
||
import { useCoreOrganization } from '../../contexts'; | ||
import { Badge, Box, Col, descriptors, Spinner } from '../../customizables'; | ||
import { ArrowBlockButton } from '../../elements'; | ||
import { useInView } from '../../hooks'; | ||
import { useRouter } from '../../router'; | ||
|
||
type DomainListProps = GetDomainsParams & { | ||
verificationStatus?: OrganizationDomainVerificationStatus; | ||
enrollmentMode?: OrganizationEnrollmentMode; | ||
/** | ||
* Enables internal links to navigate to the correct page | ||
* based on when this component is used | ||
*/ | ||
redirectSubPath: string; | ||
fallback?: React.ReactNode; | ||
}; | ||
|
||
export const DomainList = (props: DomainListProps) => { | ||
const { verificationStatus, enrollmentMode, redirectSubPath, fallback, ...rest } = props; | ||
const { organization, membership, domains } = useCoreOrganization({ | ||
domains: { | ||
infinite: true, | ||
...rest, | ||
}, | ||
}); | ||
|
||
const { ref } = useInView({ | ||
threshold: 0, | ||
onChange: inView => { | ||
if (inView) { | ||
void domains?.fetchNext?.(); | ||
} | ||
}, | ||
}); | ||
const { navigate } = useRouter(); | ||
|
||
const isAdmin = membership?.role === 'admin'; | ||
|
||
const domainList = useMemo(() => { | ||
if (!domains?.data) { | ||
return []; | ||
} | ||
|
||
return domains.data.filter(d => { | ||
let matchesStatus = true; | ||
let matchesMode = true; | ||
if (verificationStatus) { | ||
matchesStatus = !!d.verification && d.verification.status === verificationStatus; | ||
} | ||
if (enrollmentMode) { | ||
matchesMode = d.enrollmentMode === enrollmentMode; | ||
} | ||
|
||
return matchesStatus && matchesMode; | ||
}); | ||
}, [domains?.data]); | ||
|
||
if (!organization || !isAdmin) { | ||
return null; | ||
} | ||
|
||
// TODO: Split this to smaller components | ||
return ( | ||
<Col> | ||
{domainList.length === 0 && !domains?.isLoading && fallback} | ||
{domainList.map(d => ( | ||
<ArrowBlockButton | ||
key={d.id} | ||
elementDescriptor={descriptors.accordionTriggerButton} | ||
variant='ghost' | ||
colorScheme='neutral' | ||
badge={ | ||
!verificationStatus ? ( | ||
d.verification && d.verification.status === 'verified' ? ( | ||
<Badge textVariant={'extraSmallRegular'}>Verified</Badge> | ||
) : ( | ||
<Badge | ||
textVariant={'extraSmallRegular'} | ||
colorScheme={'warning'} | ||
> | ||
Unverified | ||
</Badge> | ||
) | ||
) : undefined | ||
} | ||
sx={t => ({ | ||
padding: `${t.space.$3} ${t.space.$4}`, | ||
minHeight: t.sizes.$10, | ||
})} | ||
onClick={() => { | ||
d.verification && d.verification.status === 'verified' | ||
? void navigate(`${redirectSubPath}${d.id}`) | ||
: void navigate(`${redirectSubPath}${d.id}/verify`); | ||
}} | ||
> | ||
{d.name} | ||
</ArrowBlockButton> | ||
))} | ||
{(domains?.hasNextPage || domains?.isFetching) && ( | ||
<Box | ||
ref={domains?.isFetching ? undefined : ref} | ||
sx={[ | ||
t => ({ | ||
width: '100%', | ||
height: t.space.$10, | ||
position: 'relative', | ||
}), | ||
]} | ||
> | ||
<Box | ||
sx={{ | ||
display: 'flex', | ||
margin: 'auto', | ||
position: 'absolute', | ||
left: '50%', | ||
top: '50%', | ||
transform: 'translateY(-50%) translateX(-50%)', | ||
}} | ||
> | ||
<Spinner | ||
size='md' | ||
colorScheme='primary' | ||
/> | ||
</Box> | ||
</Box> | ||
)} | ||
</Col> | ||
); | ||
}; |
Oops, something went wrong.