feat(clerk-js): Use Gate in OrganizationMembers#1849

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
panteliselef merged 3 commits into from
Oct 13, 2023
Merged

feat(clerk-js): Use Gate in OrganizationMembers #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a60b6a1
feat(clerk-js): Use Gate in OrganizationMembers
panteliselef Oct 5, 2023
7fe5f08
chore(clerk-js): OrganizationMembers remove logic that depends on "la…
panteliselef Oct 9, 2023
b4128ac
fix(clerk-js): Update to new permission names
panteliselef Oct 13, 2023
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
5 changes: 5 additions & 0 deletions .changeset/witty-boats-joke.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/common/Gate.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
GateParams & {
fallback?: ReactNode;
Expand Down
57 changes: 18 additions & 39 deletions packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
const card = useCardState();
const {
organization,
membership: currentUserMembership,
memberships,
...rest
} = useCoreOrganization({
const { organization, memberships, ...rest } = useCoreOrganization({
memberships: true,
});

const { memberships: adminMembers } = useCoreOrganization({
memberships: {
role: ['admin'],
},
});

const isAdmin = currentUserMembership?.role === 'admin';

const mutateSwrState = () => {
const unstable__mutate = (rest as any).unstable__mutate;
if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
}

const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
if (!isAdmin) {
return;
}
return card
.runAsync(async () => {
await membership.update({ role: newRole });
await (adminMembers as any).unstable__mutate?.();
})
.catch(err => handleError(err, [], card.setError));
};

const handleRemove = (membership: OrganizationMembershipResource) => () => {
if (!isAdmin) {
return;
}
return card
.runAsync(async () => {
const destroyedMembership = membership.destroy();
await (adminMembers as any).unstable__mutate?.();
const destroyedMembership = await membership.destroy();
return destroyedMembership;
})
.then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
membership={m}
onRoleChange={handleRoleChange(m)}
onRemove={handleRemove(m)}
adminCount={adminMembers?.count || 0}
/>
))}
/>
);
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
membership: OrganizationMembershipResource;
onRemove: () => unknown;
adminCount: number;
onRoleChange?: (role: MembershipRole) => unknown;
}) => {
const { membership, onRemove, onRoleChange, adminCount } = props;
const { membership, onRemove, onRoleChange } = props;
const card = useCardState();
const { membership: currentUserMembership } = useCoreOrganization();
const user = useCoreUser();

const isAdmin = currentUserMembership?.role === 'admin';
const isCurrentUser = user.id === membership.publicUserData.userId;
const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

return (
<RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
</Td>
<Td>{membership.createdAt.toLocaleDateString()}</Td>
<Td>
{isAdmin ? (
<Gate
permission={'org:sys_memberships:manage'}
fallback={
<Text
sx={t => ({ opacity: t.opacity.$inactive })}
localizationKey={roleLocalizationKey(membership.role)}
/>
}
>
<RoleSelect
isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
isDisabled={card.isLoading || !onRoleChange}
value={membership.role}
onChange={onRoleChange}
/>
) : (
<Text
sx={t => ({ opacity: t.opacity.$inactive })}
localizationKey={roleLocalizationKey(membership.role)}
/>
)}
</Gate>
</Td>
<Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
<ThreeDotsMenu
actions={[
{
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
]}
elementId={'member'}
/>
)}
</Gate>
</Td>
</RowContainer>
);
Expand Down
26 changes: 15 additions & 11 deletions packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
const { organizationSettings } = useEnvironment();
const card = useCardState();
const { membership } = useCoreOrganization();
const isAdmin = membership?.role === 'admin';
const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
const isDomainsEnabled = organizationSettings?.domains?.enabled;
const { membershipRequests } = useCoreOrganization({
membershipRequests: allowRequests || undefined,
membershipRequests: isDomainsEnabled || undefined,
});
//@ts-expect-error

// @ts-expect-error
const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.
return null;
}

return (
<Col
elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
<Tabs>
<TabsList>
<Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
{isAdmin && (
{canManageMemberships && (
<Tab
localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
/>
)}
{allowRequests && (
{canManageMemberships && isDomainsEnabled && (
<Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
<NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
</Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
width: '100%',
}}
>
{isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
{canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
<ActiveMembersList />
</Flex>
</TabPanel>
{isAdmin && (
{canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.
<TabPanel sx={{ width: '100%' }}>
<OrganizationMembersTabInvitations />
</TabPanel>
)}
{allowRequests && (
{canManageMemberships && isDomainsEnabled && (
<TabPanel sx={{ width: '100%' }}>
<OrganizationMembersTabRequests />
</TabPanel>
Expand Down
85 changes: 40 additions & 45 deletions ...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
const { organizationSettings } = useEnvironment();
const { navigate } = useRouter();
const { membership } = useCoreOrganization();
//@ts-expect-error
const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

const isAdmin = membership?.role === 'admin';

const allowDomains = organizationSettings?.domains?.enabled;

if (!isAdmin) {
return null;
}
const isDomainsEnabled = organizationSettings?.domains?.enabled;

return (
<Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
>
{__unstable_manageBillingUrl && <MembershipWidget />}

{allowDomains && (
<Col
gap={2}
sx={{
width: '100%',
}}
>
<Header.Root>
<Header.Title
localizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
)}
textVariant='largeMedium'
/>
<Header.Subtitle
localizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
)}
variant='regularRegular'
/>
</Header.Root>
<DomainList
fallback={
<BlockButton
colorScheme='primary'
textLocalizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
{isDomainsEnabled && (
<Gate permission={'org:sys_domains:manage'}>
<Col
gap={2}
sx={{
width: '100%',
}}
>
<Header.Root>
<Header.Title
localizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
)}
id='manageVerifiedDomains'
onClick={() => navigate('organization-settings/domain')}
textVariant='largeMedium'
/>
}
redirectSubPath={'organization-settings/domain/'}
verificationStatus={'verified'}
enrollmentMode={'automatic_invitation'}
/>
</Col>
<Header.Subtitle
localizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
)}
variant='regularRegular'
/>
</Header.Root>
<DomainList
fallback={
<BlockButton
colorScheme='primary'
textLocalizationKey={localizationKeys(
'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
)}
id='manageVerifiedDomains'
onClick={() => navigate('organization-settings/domain')}
/>
}
redirectSubPath={'organization-settings/domain/'}
verificationStatus={'verified'}
enrollmentMode={'automatic_invitation'}
/>
</Col>
</Gate>
)}

<Flex
Expand Down
8 changes: 1 addition & 7 deletions packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
const { navigate } = useRouter();
const { membership } = useCoreOrganization();
//@ts-expect-error
const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

const isAdmin = membership?.role === 'admin';

if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.
return null;
}
return (
<Col
gap={8}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(clerk-js): Use Gate in OrganizationMembers#1849

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

panteliselef
merged 3 commits into

from

Oct 13, 2023
 Merged


feat(clerk-js): Use Gate in OrganizationMembers
#1849
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a60b6a1

feat(clerk-js): Use Gate in OrganizationMembers


panteliselef Oct 5, 2023
7fe5f08

chore(clerk-js): OrganizationMembers remove logic that depends on "la…


panteliselef Oct 9, 2023
b4128ac

fix(clerk-js): Update to new permission names


panteliselef Oct 13, 2023

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


5 changes: 5 additions & 0 deletions
.changeset/witty-boats-joke.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Replace role based check with permission based checks inside the OrganizationMembers component.

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui/common/Gate.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import type { IsAuthorized } from '@clerk/types';
import type { IsAuthorized, OrganizationPermission } from '@clerk/types';
import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
import React, { useEffect } from 'react';

import { useCoreSession } from '../contexts';
import { useFetch } from '../hooks';
import { useRouter } from '../router';

type GateParams = Parameters<IsAuthorized>[0];
type GateParams = Omit<Parameters<IsAuthorized>[0], 'permission'> & { permission: OrganizationPermission };
type GateProps = PropsWithChildren<
 GateParams & {
 fallback?: ReactNode;
Expand Down

57 changes: 18 additions & 39 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { MembershipRole, OrganizationMembershipResource } from '@clerk/types';

import { Gate } from '../../common/Gate';
import { useCoreOrganization, useCoreUser } from '../../contexts';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
Expand All@@ -8,23 +9,10 @@ import { DataTable, RoleSelect, RowContainer } from './MemberListTable';

export const ActiveMembersList = () => {
 const card = useCardState();
 const {
 organization,
 membership: currentUserMembership,
 memberships,
 ...rest
 } = useCoreOrganization({
 const { organization, memberships, ...rest } = useCoreOrganization({
 memberships: true,
 });

 const { memberships: adminMembers } = useCoreOrganization({
 memberships: {
 role: ['admin'],
 },
 });

 const isAdmin = currentUserMembership?.role === 'admin';

 const mutateSwrState = () => {
 const unstable__mutate = (rest as any).unstable__mutate;
 if (unstable__mutate && typeof unstable__mutate === 'function') {
Expand All@@ -37,25 +25,17 @@ export const ActiveMembersList = () => {
 }

 const handleRoleChange = (membership: OrganizationMembershipResource) => (newRole: MembershipRole) => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 await membership.update({ role: newRole });
 await (adminMembers as any).unstable__mutate?.();
 })
 .catch(err => handleError(err, [], card.setError));
 };

 const handleRemove = (membership: OrganizationMembershipResource) => () => {
 if (!isAdmin) {
 return;
 }
 return card
 .runAsync(async () => {
 const destroyedMembership = membership.destroy();
 await (adminMembers as any).unstable__mutate?.();
 const destroyedMembership = await membership.destroy();
 return destroyedMembership;
 })
 .then(mutateSwrState)
Expand All@@ -82,27 +62,23 @@ export const ActiveMembersList = () => {
 membership={m}
 onRoleChange={handleRoleChange(m)}
 onRemove={handleRemove(m)}
 adminCount={adminMembers?.count || 0}
 />
 ))}
 />
 );
};

// TODO: Find a way to disable Role select based on last admin by using permissions
const MemberRow = (props: {
 membership: OrganizationMembershipResource;
 onRemove: () => unknown;
 adminCount: number;
 onRoleChange?: (role: MembershipRole) => unknown;
}) => {
 const { membership, onRemove, onRoleChange, adminCount } = props;
 const { membership, onRemove, onRoleChange } = props;
 const card = useCardState();
 const { membership: currentUserMembership } = useCoreOrganization();
 const user = useCoreUser();

 const isAdmin = currentUserMembership?.role === 'admin';
 const isCurrentUser = user.id === membership.publicUserData.userId;
 const isLastAdmin = adminCount <= 1 && membership.role === 'admin';

 return (
 <RowContainer>
Expand All@@ -123,21 +99,24 @@ const MemberRow = (props: {
 </Td>
 <Td>{membership.createdAt.toLocaleDateString()}</Td>
 <Td>
 {isAdmin ? (
 <Gate
 permission={'org:sys_memberships:manage'}
 fallback={
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 }
 >
 <RoleSelect
 isDisabled={card.isLoading || !onRoleChange || isLastAdmin}
 isDisabled={card.isLoading || !onRoleChange}
 value={membership.role}
 onChange={onRoleChange}
 />
 ) : (
 <Text
 sx={t => ({ opacity: t.opacity.$inactive })}
 localizationKey={roleLocalizationKey(membership.role)}
 />
 )}
 </Gate>
 </Td>
 <Td>
{isAdmin && (
<Gate permission={'org:sys_memberships:delete'}>
 <ThreeDotsMenu
 actions={[
 {
Expand All@@ -149,7 +128,7 @@ const MemberRow = (props: {
 ]}
 elementId={'member'}
 />
)}
</Gate>
 </Td>
 </RowContainer>
 );
Expand Down

26 changes: 15 additions & 11 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { NotificationCountBadge } from '../../common';
import { NotificationCountBadge, useGate } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import {
Expand All@@ -21,15 +21,19 @@ import { OrganizationMembersTabRequests } from './OrganizationMembersTabRequests
export const OrganizationMembers = withCardStateProvider(() => {
 const { organizationSettings } = useEnvironment();
 const card = useCardState();
 const { membership } = useCoreOrganization();
 const isAdmin = membership?.role === 'admin';
 const allowRequests = organizationSettings?.domains?.enabled && isAdmin;
 const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' });
 const isDomainsEnabled = organizationSettings?.domains?.enabled;
 const { membershipRequests } = useCoreOrganization({
 membershipRequests: allowRequests || undefined,
 membershipRequests: isDomainsEnabled || undefined,
 });
 //@ts-expect-error

 // @ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 if (canManageMemberships === null) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -52,12 +56,12 @@ export const OrganizationMembers = withCardStateProvider(() => {
 <Tabs>
 <TabsList>
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__members')} />
 {isAdmin && (
 {canManageMemberships && (
 <Tab
 localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__invitations')}
 />
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <Tab localizationKey={localizationKeys('organizationProfile.membersPage.start.headerTitle__requests')}>
 <NotificationCountBadge notificationCount={membershipRequests?.count || 0} />
 </Tab>
Expand All@@ -72,16 +76,16 @@ export const OrganizationMembers = withCardStateProvider(() => {
 width: '100%',
 }}
 >
 {isAdmin && __unstable_manageBillingUrl && <MembershipWidget />}
 {canManageMemberships && __unstable_manageBillingUrl && <MembershipWidget />}
 <ActiveMembersList />
 </Flex>
 </TabPanel>
 {isAdmin && (
 {canManageMemberships && (
Comment thread
chanioxaris marked this conversation as resolved.

 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabInvitations />
 </TabPanel>
 )}
 {allowRequests && (
 {canManageMemberships && isDomainsEnabled && (
 <TabPanel sx={{ width: '100%' }}>
 <OrganizationMembersTabRequests />
 </TabPanel>
Expand Down

85 changes: 40 additions & 45 deletions
...ages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabInvitations.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { BlockButton, Gate } from '../../common';
import { useEnvironment, useOrganizationProfileContext } from '../../contexts';
import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables';
import { Header, IconButton } from '../../elements';
import { UserAdd } from '../../icons';
Expand All@@ -11,17 +11,10 @@ import { MembershipWidget } from './MembershipWidget';
export const OrganizationMembersTabInvitations = () => {
 const { organizationSettings } = useEnvironment();
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 const allowDomains = organizationSettings?.domains?.enabled;

 if (!isAdmin) {
 return null;
 }
 const isDomainsEnabled = organizationSettings?.domains?.enabled;

 return (
 <Col
Expand All@@ -32,43 +25,45 @@ export const OrganizationMembersTabInvitations = () => {
 >
 {__unstable_manageBillingUrl && <MembershipWidget />}

 {allowDomains && (
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 textVariant='largeMedium'
 />
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 {isDomainsEnabled && (
 <Gate permission={'org:sys_domains:manage'}>
 <Col
 gap={2}
 sx={{
 width: '100%',
 }}
 >
 <Header.Root>
 <Header.Title
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerTitle',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 textVariant='largeMedium'
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 <Header.Subtitle
 localizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.headerSubtitle',
 )}
 variant='regularRegular'
 />
 </Header.Root>
 <DomainList
 fallback={
 <BlockButton
 colorScheme='primary'
 textLocalizationKey={localizationKeys(
 'organizationProfile.membersPage.invitationsTab.autoInvitations.primaryButton',
 )}
 id='manageVerifiedDomains'
 onClick={() => navigate('organization-settings/domain')}
 />
 }
 redirectSubPath={'organization-settings/domain/'}
 verificationStatus={'verified'}
 enrollmentMode={'automatic_invitation'}
 />
 </Col>
 </Gate>
 )}

 <Flex
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembersTabRequests.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { BlockButton } from '../../common';
import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts';
import { useOrganizationProfileContext } from '../../contexts';
import { Col, Flex, localizationKeys } from '../../customizables';
import { Header } from '../../elements';
import { useRouter } from '../../router';
Expand All@@ -9,15 +9,9 @@ import { RequestToJoinList } from './RequestToJoinList';

export const OrganizationMembersTabRequests = () => {
 const { navigate } = useRouter();
 const { membership } = useCoreOrganization();
 //@ts-expect-error
 const { __unstable_manageBillingUrl } = useOrganizationProfileContext();

 const isAdmin = membership?.role === 'admin';

 if (!isAdmin) {
Comment thread
chanioxaris marked this conversation as resolved.

 return null;
 }
 return (
 <Col
 gap={8}
Expand Down
Loading