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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(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(localizations,shared,ui): Change invite members CTA based on available seats by dstaley · Pull Request #8612 · 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
1 change: 1 addition & 0 deletions packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -540,6 +540,7 @@ export const enUS: LocalizationResource = {
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
formButtonPrimary__purchaseSeats: 'Purchase additional seats',
selectDropdown__role: 'Select role',
subtitle: 'Enter or paste one or more email addresses, separated by spaces or commas.',
successMessage: 'Invitations successfully sent',
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1115,6 +1115,7 @@ export type __internal_LocalizationResource = {
successMessage: LocalizationValue;
detailsTitle__inviteFailed: LocalizationValue<'email_addresses'>;
formButtonPrimary__continue: LocalizationValue;
formButtonPrimary__purchaseSeats: LocalizationValue;
selectDropdown__role: LocalizationValue;
};
removeDomainPage: {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,11 @@ import { useCardState } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
import { TagInput } from '@/ui/elements/TagInput';
import {
getPaidSeatsUnitTier,
getSeatUnitPrice,
organizationAndInvitationsExceedsPurchasedSeats,
} from '@/ui/utils/billingPlanSeats';
import { handleError } from '@/ui/utils/errorHandler';
import { getClosestProfileScrollBoxFromElement } from '@/ui/utils/getClosestProfileScrollBox';
import { createListFormat } from '@/ui/utils/passwordUtils';
Expand DownExpand Up@@ -39,7 +44,8 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
keepPreviousData: true,
},
});
const { subscriptionItems } = useSubscription();
const { data: subscription, subscriptionItems } = useSubscription();
const activeSubscriptionItem = subscription?.subscriptionItems.find(si => si.status === 'active');
const { handleSelectPlan } = usePlansContext();
const card = useCardState();
const { t, locale } = useLocalizations();
Expand DownExpand Up@@ -78,6 +84,14 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
} = emailAddressField;

const canSubmit = (!!emailAddressField.value.length || isValidUnsubmittedEmail) && !!roleField.value;
const emailAddresses = emailAddressField.value.split(',');

const seatUnitPrice = activeSubscriptionItem ? getSeatUnitPrice(activeSubscriptionItem.plan) : null;
const paidSeatsTier = seatUnitPrice ? getPaidSeatsUnitTier(seatUnitPrice) : null;
const isPerSeatCostPlan = !!paidSeatsTier;
const mustPurchaseSeats =
isPerSeatCostPlan &&
organizationAndInvitationsExceedsPurchasedSeats(activeSubscriptionItem, organization, emailAddresses.length);

const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
Expand DownExpand Up@@ -232,7 +246,11 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
<Form.SubmitButton
block={false}
isDisabled={!canSubmit}
localizationKey={localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')}
localizationKey={
isPerSeatCostPlan && mustPurchaseSeats
? localizationKeys('organizationProfile.invitePage.formButtonPrimary__purchaseSeats')
: localizationKeys('organizationProfile.invitePage.formButtonPrimary__continue')
}
/>
<Form.ResetButton
localizationKey={resetButtonLabel || localizationKeys('userProfile.formButtonReset')}
Expand Down
80 changes: 78 additions & 2 deletions packages/ui/src/utils/__tests__/billingPlanSeats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
import type { BillingMoneyAmount, BillingPaymentTotals, BillingPerUnitTotal } from '@clerk/shared/types';
import type {
BillingMoneyAmount,
BillingPaymentTotals,
BillingPerUnitTotal,
BillingPlanUnitPrice,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';
import { describe, expect, test } from 'vitest';

import { getSeatsPerUnitTotal, summarizeSeatCharges } from '../billingPlanSeats';
import {
getPaidSeatsUnitTier,
getSeatsPerUnitTotal,
organizationAndInvitationsExceedsPurchasedSeats,
summarizeSeatCharges,
} from '../billingPlanSeats';

const money = (amount: number): BillingMoneyAmount => ({
amount,
Expand DownExpand Up@@ -121,3 +133,67 @@ describe('summarizeSeatCharges', () => {
expect(summary!.included).toBe(0);
});
});

describe('getPaidSeatsUnitTier', () => {
test('returns the paid tier from a seats unit price with included seats', () => {
const paidTier = {
id: 'tier_paid',
startsAtBlock: 4,
endsAfterBlock: null,
feePerBlock: money(500),
};
const unitPrice: BillingPlanUnitPrice = {
name: 'seats',
blockSize: 1,
tiers: [
{
id: 'tier_included',
startsAtBlock: 1,
endsAfterBlock: 3,
feePerBlock: money(0),
},
paidTier,
],
};

expect(getPaidSeatsUnitTier(unitPrice)).toBe(paidTier);
});
});

describe('organizationAndInvitationsExceedsPurchasedSeats', () => {
test('returns true when members, pending invitations, and invitations exceed seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 4 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(true);
});

test('returns false when members, pending invitations, and invitations equal seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 5 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});

test('returns false when members, pending invitations, and invitations are below seats entitlements', () => {
const subscriptionItem = {
seats: { quantity: 10 },
} as BillingSubscriptionItemResource;
const organization = {
membersCount: 2,
pendingInvitationsCount: 1,
} as OrganizationResource;

expect(organizationAndInvitationsExceedsPurchasedSeats(subscriptionItem, organization, 2)).toBe(false);
});
});
37 changes: 37 additions & 0 deletions packages/ui/src/utils/billingPlanSeats.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand DownExpand Up@@ -135,6 +137,26 @@ export const getIncludedSeatsUnitTotalTier = (
return null;
};

export const getPaidSeatsUnitTier = (unitPrice: BillingPlanUnitPrice | null): BillingPlanUnitPriceTier | null => {
Comment thread
dstaley marked this conversation as resolved.
if (!unitPrice) {
return null;
}

if (unitPrice.tiers.length === 1 && unitPrice.tiers[0].feePerBlock.amount > 0) {
return unitPrice.tiers[0];
}

if (
unitPrice.tiers.length === 2 &&
unitPrice.tiers[0].feePerBlock.amount === 0 &&
unitPrice.tiers[1].feePerBlock.amount > 0
) {
return unitPrice.tiers[1];
}

return null;
};

/**
* Given a plan, return the seat limit for the plan in seats (not blocks), or `null` if seats are
* unlimited, or `undefined` if the plan has no seat-based pricing.
Expand DownExpand Up@@ -166,6 +188,21 @@ export const organizationExceedsPlanSeatLimit = (
return organization.membersCount + organization.pendingInvitationsCount > seatLimit;
};

export const organizationAndInvitationsExceedsPurchasedSeats = (
Comment thread
dstaley marked this conversation as resolved.
subscriptionItem: BillingSubscriptionItemResource | undefined,
organization: OrganizationResource,
invitationsCount: number,
): boolean => {
if (!subscriptionItem || !subscriptionItem.seats || !subscriptionItem.seats.quantity) {
return false;
}

return (
organization.membersCount + organization.pendingInvitationsCount + invitationsCount >
subscriptionItem.seats.quantity
);
};

export const isPlanWithPerSeatCosts = (plan: BillingPlanResource): boolean => {
const seatUnitPrice = getSeatUnitPrice(plan);

Expand Down
Loading