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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 Down Expand 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 Down Expand 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 Down Expand 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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import type {
BillingPerUnitTotalTier,
BillingPlanResource,
BillingPlanUnitPrice,
BillingPlanUnitPriceTier,
BillingSubscriptionItemResource,
OrganizationResource,
} from '@clerk/shared/types';

Expand Down Expand 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 Down Expand 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