Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(ui): Add per-seat cost details to manage subscription view by dstaley · Pull Request #8768 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 41 additions & 19 deletions packages/ui/src/components/SubscriptionDetails/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Drawer, useDrawerContext } from '@/ui/elements/Drawer';
import { LineItems } from '@/ui/elements/LineItems';
import { handleError } from '@/ui/utils/errorHandler';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';

import {
Expand DownExpand Up@@ -511,6 +512,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
// New component for individual subscription cards
const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionItemResource }) => {
const { t } = useLocalizations();
const subItemSeatsQty = subscription.seats?.quantity;
const firstPaidSeatTier = subscription.seats?.tiers?.find(tier => tier.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscription.plan);

const fee =
subscription.planPeriod === 'month'
Expand DownExpand Up@@ -604,31 +609,44 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
</Flex>
</Col>

{subscription.seats ? (
{typeof subItemSeatsQty !== 'undefined' ? (
<DetailRow
variant='header'
labelNode={
<Text
sx={t => ({
display: 'inline-flex',
alignItems: 'center',
gap: t.space.$1,
})}
<Flex
align='center'
gap={1}
>
<Icon
icon={Users}
size='md'
colorScheme='neutral'
/>
<Text localizationKey={localizationKeys('billing.seats')} />
</Text>
</Flex>
}
value={
subscription.seats.quantity === null
? localizationKeys('billing.pricingTable.seatCost.unlimitedSeats')
: localizationKeys('billing.pricingTable.seatCost.upToSeats', {
endsAfterBlock: subscription.seats.quantity,
})
valueNode={
<Col
gap={1}
align='end'
>
{seatLimitAndIncludedSeatsLocalizationKey ? (
<Text
variant='subtitle'
localizationKey={seatLimitAndIncludedSeatsLocalizationKey}
/>
) : null}
{firstPaidSeatTier && firstPaidSeatTier.quantity ? (
<Text variant='subtitle'>
{t(
localizationKeys('organizationProfile.billingPage.subscriptionsListSection.paidSeatsUsage', {
seatsQuantity: firstPaidSeatTier.quantity,
amount: `${firstPaidSeatTier.feePerBlock.currencySymbol}${firstPaidSeatTier.feePerBlock.amountFormatted} / ${monthLabel}`,
}),
)}
</Text>
) : null}
</Col>
}
/>
) : null}
Expand DownExpand Up@@ -683,17 +701,19 @@ const DetailRow = ({
label,
labelNode,
value,
valueNode,
variant,
}: {
label?: LocalizationKey;
labelNode?: React.ReactNode;
value: string | LocalizationKey;
value?: string | LocalizationKey;
valueNode?: React.ReactNode;
variant?: 'header';
}) => (
<Flex
elementDescriptor={descriptors.subscriptionDetailsDetailRow}
justify='between'
align='center'
align={valueNode ? 'start' : 'center'}
sx={t => ({
paddingInline: t.space.$3,
paddingBlock: t.space.$3,
Expand All@@ -714,19 +734,21 @@ const DetailRow = ({
/>
) : null}
{labelNode ? labelNode : null}
{typeof value === 'string' ? (
{valueNode ? (
valueNode
) : typeof value === 'string' ? (
<Text
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
>
{value}
</Text>
) : (
) : value ? (
<Text
localizationKey={value}
elementDescriptor={descriptors.subscriptionDetailsDetailRowValue}
colorScheme='secondary'
/>
)}
) : null}
</Flex>
);
25 changes: 2 additions & 23 deletions packages/ui/src/components/Subscriptions/SubscriptionsList.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { Fragment, useMemo } from 'react';
import { useProtect } from '@/ui/common/Gate';
import { ProfileSection } from '@/ui/elements/Section';
import { common } from '@/ui/styledSystem';
import { getIncludedSeatsUnitTier, getPlanSeatLimit, getSeatUnitPrice } from '@/ui/utils/billingPlanSeats';
import { getSeatLimitAndIncludedSeatsLocalizationKey } from '@/ui/utils/billingPlanSeats';

import {
normalizeFormatted,
Expand DownExpand Up@@ -256,30 +256,9 @@ function SubscriptionItemRow({
}, [fee.amountFormatted]);

const subItemSeatsQty = subscriptionItem.seats?.quantity;
const seatUnitPrice = getSeatUnitPrice(subscriptionItem.plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(subscriptionItem.plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;
const seatsTotalTier = subscriptionItem.seats?.tiers?.find(t => t.total.amount > 0);
const monthLabel = t(localizationKeys('billing.month')).toLowerCase();
const seatLimitAndIncludedSeatsLocalizationKey =
typeof planSeatLimit === 'number' && includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
})
: typeof planSeatLimit === 'number'
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
})
: includedSeats !== null
? localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
})
: null;
const seatLimitAndIncludedSeatsLocalizationKey = getSeatLimitAndIncludedSeatsLocalizationKey(subscriptionItem.plan);

return (
<Fragment key={subscriptionItem.id}>
Expand Down
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import type {
OrganizationResource,
} from '@clerk/shared/types';

import { type LocalizationKey, localizationKeys } from '../localization';

/**
* Given a plan, return the unit price for seats.
*/
Expand DownExpand Up@@ -191,6 +193,41 @@ export const getPlanSeatLimit = (plan: BillingPlanResource): number | null | und
return lastTier.endsAfterBlock != null ? lastTier.endsAfterBlock * seatUnitPrice.blockSize : null;
};

export const getSeatLimitAndIncludedSeatsLocalizationKey = (plan: BillingPlanResource): LocalizationKey | null => {
const seatUnitPrice = getSeatUnitPrice(plan);
const includedSeatsUnitTier = getIncludedSeatsUnitTier(seatUnitPrice);
const planSeatLimit = getPlanSeatLimit(plan);
const includedSeats =
includedSeatsUnitTier?.endsAfterBlock != null && seatUnitPrice
? includedSeatsUnitTier.endsAfterBlock * seatUnitPrice.blockSize
: null;

// plan has a seat limit and included seats
if (typeof planSeatLimit === 'number' && includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimitAndIncludedSeats', {
seatLimit: planSeatLimit,
includedSeats,
});
}

// plan only has a seat limit
if (typeof planSeatLimit === 'number') {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.seatLimit', {
seatLimit: planSeatLimit,
});
}

// plan only has included seats
if (includedSeats !== null) {
return localizationKeys('organizationProfile.billingPage.subscriptionsListSection.includedSeatsUsage', {
includedSeats,
});
}

// plan doesn't have a seat limit or included seats
return null;
};

/**
* Given a plan and an organization, return true if the organization exceeds the seat limit for the plan.
*/
Expand Down
Loading