feat(clerk-js,localizations,msw,shared,ui): Add display for member limits#7920

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
dstaley merged 9 commits into from
Mar 12, 2026
Merged

feat(clerk-js,localizations,msw,shared,ui): Add display for member limits #7920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
517ab55
feat(clerk-js,localizations,msw,shared,ui): Add display for member li…
dstaley Feb 20, 2026
55ddfb5
feat(): Change to membershipSeatUsageLabel
dstaley Feb 24, 2026
cc8bbba
fix(localizations): Update text
dstaley Feb 27, 2026
3e31113
fix(ui): Use org maxAllowedMemberships, not env
dstaley Feb 27, 2026
c008231
Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits
dstaley Mar 6, 2026
424f675
Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits
dstaley Mar 12, 2026
82fe5cf
fix(ui): Only render seat usage when limited
dstaley Mar 12, 2026
4504aa0
fix(ui): remove cruft
dstaley Mar 12, 2026
da46b83
lint(ui): sort imports
dstaley Mar 12, 2026
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
1 change: 1 addition & 0 deletions packages/clerk-js/sandbox/scenarios/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';
74 changes: 74 additions & 0 deletions packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
BillingService,
clerkHandlers,
EnvironmentService,
SessionService,
setClerkState,
type MockScenario,
UserService,
OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
const user = UserService.create();
user.organizationMemberships = [
{
object: 'organization_membership',
id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
public_metadata: {},
role: 'org:owner',
role_name: 'Owner',
permissions: [
'org:applications:create',
'org:applications:manage',
'org:applications:delete',
'org:billing:read',
'org:billing:manage',
'org:config:read',
'org:config:manage',
'org:global:read',
'org:global:manage',
'org:instances:create',
'org:instances:manage',
'org:instances:delete',
'org:restrictions:read',
'org:restrictions:manage',
'org:secrets:manage',
'org:users:imp',
'org:sys_profile:manage',
'org:sys_profile:delete',
'org:sys_billing:read',
'org:sys_billing:manage',
'org:sys_domains:read',
'org:sys_domains:manage',
'org:sys_memberships:read',
'org:sys_memberships:manage',
],
created_at: 1752751315275,
updated_at: 1752751315275,
organization,
},
];
const session = SessionService.create(user);
const plans = BillingService.createDefaultPlans();
const subscription = BillingService.createSubscription(plans[1]);

setClerkState({
environment: EnvironmentService.MULTI_SESSION,
session,
user,
organization,
billing: {
plans,
subscription,
},
});

return {
description: 'OrganizationProfile with a seat limit',
handlers: clerkHandlers,
initialState: { session, user, organization },
name: 'org-profile-seat-limit',
};
}
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
start: {
headerTitle__general: 'General',
headerTitle__members: 'Members',
membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
profileSection: {
primaryButton: 'Update profile',
title: 'Organization Profile',
Expand Down
6 changes: 4 additions & 2 deletions packages/msw/request-handlers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
if (membership) {
return createNoStoreResponse({
data: [SessionService.serialize(membership)],
total_count: 1,
response: {
data: [SessionService.serialize(membership)],
total_count: 1,
},
});
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
badge__manualInvitation: LocalizationValue;
start: {
headerTitle__members: LocalizationValue;
membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
headerTitle__general: LocalizationValue;
profileSection: {
title: LocalizationValue;
Expand Down
46 changes: 44 additions & 2 deletions packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
const [query, setQuery] = useState('');
const [search, setSearch] = useState('');

const { membershipRequests, memberships, invitations } = useOrganization({
const { membershipRequests, memberships, invitations, organization } = useOrganization({
membershipRequests: isDomainsEnabled || undefined,
invitations: canManageMemberships || undefined,
memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
elementDescriptor={descriptors.profilePage}
elementId={descriptors.profilePage.setId('organizationMembers')}
gap={4}
sx={theme => ({ paddingBottom: theme.space.$13 })}
>
<Action.Root animate={false}>
<Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
</Tabs>
</Action.Root>
</Col>

{canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
<Box
sx={theme => ({
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
backgroundColor: theme.colors.$colorBackground,
borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
paddingInline: theme.space.$4,
height: theme.space.$13,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
})}
>
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$2,
})}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text
as='span'
colorScheme='inherit'
localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
count: memberships.count + (invitations?.count ?? 0),
limit: organization.maxAllowedMemberships,
})}
/>
</Text>
</Box>
) : null}
</Col>
);
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
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,localizations,msw,shared,ui): Add display for member limits#7920

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

dstaley
merged 9 commits into

from

Mar 12, 2026
 Merged


feat(clerk-js,localizations,msw,shared,ui): Add display for member limits
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
517ab55

feat(clerk-js,localizations,msw,shared,ui): Add display for member li…


dstaley Feb 20, 2026
55ddfb5

feat(): Change to membershipSeatUsageLabel


dstaley Feb 24, 2026
cc8bbba

fix(localizations): Update text


dstaley Feb 27, 2026
3e31113

fix(ui): Use org maxAllowedMemberships, not env


dstaley Feb 27, 2026
c008231

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 6, 2026
424f675

Merge branch 'feat/seat-based-billing' into ds.feat/sbb-member-limits


dstaley Mar 12, 2026
82fe5cf

fix(ui): Only render seat usage when limited


dstaley Mar 12, 2026
4504aa0

fix(ui): remove cruft


dstaley Mar 12, 2026
da46b83

lint(ui): sort imports


dstaley Mar 12, 2026

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


1 change: 1 addition & 0 deletions
packages/clerk-js/sandbox/scenarios/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { UserButtonSignedIn } from './user-button-signed-in';
export { CheckoutAccountCredit } from './checkout-account-credit';
export { OrgProfileSeatLimit } from './org-profile-seat-limit';
export { PricingTableSBB } from './pricing-table-sbb';

74 changes: 74 additions & 0 deletions
packages/clerk-js/sandbox/scenarios/org-profile-seat-limit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
import {
 BillingService,
 clerkHandlers,
 EnvironmentService,
 SessionService,
 setClerkState,
 type MockScenario,
 UserService,
 OrganizationService,
} from '@clerk/msw';

export function OrgProfileSeatLimit(): MockScenario {
 const organization = OrganizationService.create({ maxAllowedMemberships: 10 });
 const user = UserService.create();
 user.organizationMemberships = [
 {
 object: 'organization_membership',
 id: 'orgmem_3004mVaZrB4yD63C9KuwTMWNKbj',
 public_metadata: {},
 role: 'org:owner',
 role_name: 'Owner',
 permissions: [
 'org:applications:create',
 'org:applications:manage',
 'org:applications:delete',
 'org:billing:read',
 'org:billing:manage',
 'org:config:read',
 'org:config:manage',
 'org:global:read',
 'org:global:manage',
 'org:instances:create',
 'org:instances:manage',
 'org:instances:delete',
 'org:restrictions:read',
 'org:restrictions:manage',
 'org:secrets:manage',
 'org:users:imp',
 'org:sys_profile:manage',
 'org:sys_profile:delete',
 'org:sys_billing:read',
 'org:sys_billing:manage',
 'org:sys_domains:read',
 'org:sys_domains:manage',
 'org:sys_memberships:read',
 'org:sys_memberships:manage',
 ],
 created_at: 1752751315275,
 updated_at: 1752751315275,
 organization,
 },
 ];
 const session = SessionService.create(user);
 const plans = BillingService.createDefaultPlans();
 const subscription = BillingService.createSubscription(plans[1]);

 setClerkState({
 environment: EnvironmentService.MULTI_SESSION,
 session,
 user,
 organization,
 billing: {
 plans,
 subscription,
 },
 });

 return {
 description: 'OrganizationProfile with a seat limit',
 handlers: clerkHandlers,
 initialState: { session, user, organization },
 name: 'org-profile-seat-limit',
 };
}

1 change: 1 addition & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -474,6 +474,7 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
 membershipSeatUsageLabel: '{{count}} of {{limit}} seats used',
 profileSection: {
 primaryButton: 'Update profile',
 title: 'Organization Profile',
Expand Down

6 changes: 4 additions & 2 deletions
packages/msw/request-handlers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1114,8 +1114,10 @@ export const clerkHandlers = [
 const membership = (currentUser as any).organizationMemberships.find((m: any) => m.organization?.id === orgId);
 if (membership) {
 return createNoStoreResponse({
 data: [SessionService.serialize(membership)],
 total_count: 1,
 response: {
 data: [SessionService.serialize(membership)],
 total_count: 1,
 },
 });
 }
 }
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1022,6 +1022,7 @@ export type __internal_LocalizationResource = {
 badge__manualInvitation: LocalizationValue;
 start: {
 headerTitle__members: LocalizationValue;
 membershipSeatUsageLabel: LocalizationValue<'count' | 'limit'>;
 headerTitle__general: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
Expand Down

46 changes: 44 additions & 2 deletions
packages/ui/src/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';

import { useFetchRoles } from '@/hooks/useFetchRoles';
import { Users } from '@/icons';
import { Alert } from '@/ui/elements/Alert';
import { Animated } from '@/ui/elements/Animated';
import { Card } from '@/ui/elements/Card';
Expand All@@ -11,7 +12,7 @@ import { Tab, TabPanel, TabPanels, Tabs, TabsList } from '@/ui/elements/Tabs';

import { NotificationCountBadge, useProtect } from '../../common';
import { useEnvironment } from '../../contexts';
import { Col, descriptors, Flex, localizationKeys } from '../../customizables';
import { Box, Col, descriptors, Flex, Icon, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';
import { mqu } from '../../styledSystem';
import { ActiveMembersList } from './ActiveMembersList';
Expand All@@ -33,7 +34,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 const [query, setQuery] = useState('');
 const [search, setSearch] = useState('');

 const { membershipRequests, memberships, invitations } = useOrganization({
 const { membershipRequests, memberships, invitations, organization } = useOrganization({
 membershipRequests: isDomainsEnabled || undefined,
 invitations: canManageMemberships || undefined,
 memberships: canReadMemberships
Expand All@@ -57,6 +58,7 @@ export const OrganizationMembers = withCardStateProvider(() => {
 elementDescriptor={descriptors.profilePage}
 elementId={descriptors.profilePage.setId('organizationMembers')}
 gap={4}
 sx={theme => ({ paddingBottom: theme.space.$13 })}
 >
 <Action.Root animate={false}>
 <Animated asChild>
Expand DownExpand Up@@ -173,6 +175,46 @@ export const OrganizationMembers = withCardStateProvider(() => {
 </Tabs>
 </Action.Root>
 </Col>

 {canReadMemberships && !!memberships?.count && organization && organization.maxAllowedMemberships > 0 ? (
 <Box
 sx={theme => ({
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 backgroundColor: theme.colors.$colorBackground,
 borderTop: `1px solid ${theme.colors.$borderAlpha100}`,
 paddingInline: theme.space.$4,
 height: theme.space.$13,
 display: 'flex',
 alignItems: 'center',
 justifyContent: 'center',
 })}
 >
 <Text
 sx={t => ({
 display: 'inline-flex',
 alignItems: 'center',
 gap: t.space.$2,
 })}
 >
 <Icon
 icon={Users}
 size='md'
 colorScheme='neutral'
 />
 <Text
 as='span'
 colorScheme='inherit'
 localizationKey={localizationKeys('organizationProfile.start.membershipSeatUsageLabel', {
 count: memberships.count + (invitations?.count ?? 0),
 limit: organization.maxAllowedMemberships,
 })}
 />
 </Text>
 </Box>
 ) : null}
 </Col>
 );
});
Loading