Skip to content

fix(sub v3): Rework usage and reserved columns #101514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2025
Merged

fix(sub v3): Rework usage and reserved columns #101514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions static/gsApp/views/subscriptionPage/usageOverview.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ describe('UsageOverview', () => {
/>
);
expect(screen.getByRole('columnheader', {name: 'Product'})).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Current usage'})).toBeInTheDocument();
expect(
screen.getByRole('columnheader', {name: 'Reserved usage'})
).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Total usage'})).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Reserved'})).toBeInTheDocument();
expect(
screen.getByRole('columnheader', {name: 'Reserved spend'})
).toBeInTheDocument();
Expand All @@ -76,10 +74,8 @@ describe('UsageOverview', () => {
/>
);
expect(screen.getByRole('columnheader', {name: 'Product'})).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Current usage'})).toBeInTheDocument();
expect(
screen.getByRole('columnheader', {name: 'Reserved usage'})
).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Total usage'})).toBeInTheDocument();
expect(screen.getByRole('columnheader', {name: 'Reserved'})).toBeInTheDocument();
expect(screen.queryByText('Reserved spend')).not.toBeInTheDocument();
expect(screen.queryByText('Pay-as-you-go spend')).not.toBeInTheDocument();
expect(
Expand Down Expand Up @@ -120,6 +116,7 @@ describe('UsageOverview', () => {
subscription.categories.attachments = {
...subscription.categories.attachments!,
reserved: 25, // 25 GB
prepaid: 25, // 25 GB
free: 0,
usage: GIGABYTE / 2,
};
Expand All @@ -145,21 +142,21 @@ describe('UsageOverview', () => {
expect(screen.queryByText('Trial available')).not.toBeInTheDocument();

// Replays product trial active
expect(screen.getByText('20 days left')).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '20 days left'})).toBeInTheDocument();

// Errors usage and gifted units
expect(screen.getByText('6,000 / 51,000')).toBeInTheDocument();
expect(screen.getByText('$10.00')).toBeInTheDocument();
expect(screen.getByText('12%')).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '6,000'})).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '$10.00'})).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '12% of 51,000'})).toBeInTheDocument();

// Attachments usage should be in the correct unit + above platform volume
expect(screen.getByText('500 MB / 25 GB')).toBeInTheDocument();
expect(screen.getByText('50%')).toBeInTheDocument();
expect(screen.getByText('$6.00')).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '500 MB'})).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '2% of 25 GB'})).toBeInTheDocument();
expect(screen.getByRole('cell', {name: '$6.00'})).toBeInTheDocument();

// Reserved spans above platform volume
expect(screen.getByText('0 / 20,000,000')).toBeInTheDocument();
expect(screen.getByText('$32.00')).toBeInTheDocument();
expect(screen.getAllByRole('cell', {name: '0'}).length).toBeGreaterThan(0);
expect(screen.getByRole('cell', {name: '$32.00'})).toBeInTheDocument();
});

it('renders table based on add-on state', () => {
Expand Down
123 changes: 64 additions & 59 deletions static/gsApp/views/subscriptionPage/usageOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
);
return [
{key: 'product', name: t('Product'), width: 250},
{key: 'currentUsage', name: t('Current usage'), width: 200},
{key: 'reservedUsage', name: t('Reserved usage'), width: 200},
{key: 'totalUsage', name: t('Total usage'), width: 200},
{key: 'reservedUsage', name: t('Reserved'), width: 300},
{key: 'reservedSpend', name: t('Reserved spend'), width: isXlScreen ? 200 : 150},
{
key: 'budgetSpend',
Expand Down Expand Up @@ -265,22 +265,22 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
// TODO(isabella): refactor this to have better types
const productData: Array<{
budgetSpend: number;
currentUsage: number;
hasAccess: boolean;
isClickable: boolean;
isPaygOnly: boolean;
isUnlimited: boolean;
product: string;
totalUsage: number;
addOnCategory?: AddOnCategory;
ariaLabel?: string;
dataCategory?: DataCategory;
free?: number;
isChildProduct?: boolean;
isOpen?: boolean;
percentUsed?: number;
productTrialCategory?: DataCategory;
reserved?: number;
reservedSpend?: number;
reservedUsage?: number;
softCapType?: 'ON_DEMAND' | 'TRUE_FORWARD';
toggleKey?: DataCategory | AddOnCategory;
}> = useMemo(() => {
Expand Down Expand Up @@ -342,8 +342,8 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
isUnlimited: !!activeProductTrial || reserved === UNLIMITED_RESERVED,
softCapType: softCapType ?? undefined,
product: productName,
currentUsage: total,
reservedUsage: percentUsed,
totalUsage: total,
percentUsed,
reservedSpend: recurringReservedSpend,
budgetSpend: paygTotal,
productTrialCategory: category,
Expand Down Expand Up @@ -431,7 +431,7 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
isUnlimited: !!activeProductTrial,
softCapType: softCapType ?? undefined,
budgetSpend: childPaygTotal,
currentUsage: (childSpend ?? 0) + childPaygTotal,
totalUsage: (childSpend ?? 0) + childPaygTotal,
product: childProductName,
isClickable: categoryInfo?.tallyType === 'usage',
};
Expand All @@ -450,8 +450,8 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
isUnlimited: !!activeProductTrial,
productTrialCategory: addOnDataCategories[0] as DataCategory,
product: addOnName,
currentUsage: (reservedBudget?.totalReservedSpend ?? 0) + paygTotal,
reservedUsage: percentUsed,
totalUsage: (reservedBudget?.totalReservedSpend ?? 0) + paygTotal,
percentUsed,
reservedSpend: recurringReservedSpend,
budgetSpend: paygTotal,
isClickable: hasAccess,
Expand Down Expand Up @@ -482,7 +482,7 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
},
renderBodyCell: (column, row) => {
const {
currentUsage,
totalUsage,
hasAccess,
isPaygOnly,
isUnlimited,
Expand All @@ -493,7 +493,7 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
isChildProduct,
isOpen,
reserved,
reservedUsage,
percentUsed,
softCapType,
toggleKey,
productTrialCategory,
Expand Down Expand Up @@ -543,60 +543,19 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
</Flex>
);
}
case 'currentUsage': {
case 'totalUsage': {
const formattedTotal = addOnCategory
? displayPriceWithCents({cents: currentUsage})
? displayPriceWithCents({cents: totalUsage})
: dataCategory
? formatUsageWithUnits(currentUsage, dataCategory, {
? formatUsageWithUnits(totalUsage, dataCategory, {
useUnitScaling: true,
})
: currentUsage;
const formattedReserved = addOnCategory
? displayPriceWithCents({cents: reserved ?? 0})
: dataCategory
? formatReservedWithUnits(reserved ?? 0, dataCategory, {
useUnitScaling: true,
})
: (reserved ?? 0);
const formattedFree = addOnCategory
? displayPriceWithCents({cents: free ?? 0})
: dataCategory
? formatReservedWithUnits(free ?? 0, dataCategory, {
useUnitScaling: true,
})
: (free ?? 0);
const formattedReservedTotal = addOnCategory
? displayPriceWithCents({cents: (reserved ?? 0) + (free ?? 0)})
: dataCategory
? formatReservedWithUnits((reserved ?? 0) + (free ?? 0), dataCategory, {
useUnitScaling: true,
})
: (reserved ?? 0) + (free ?? 0);
const formattedCurrentUsage =
isPaygOnly || isChildProduct
? formattedTotal
: `${formattedTotal} / ${formattedReservedTotal}`;
: totalUsage;

return (
<Flex align="center" gap="sm" width="max-content">
<Text as="div" textWrap="balance">
{isUnlimited ? UNLIMITED : formattedCurrentUsage}{' '}
{!(isPaygOnly || isChildProduct) && (
<QuestionTooltip
size="xs"
position="top"
title={
isUnlimited
? t('Unlimited usage during your product trial')
: tct('[formattedReserved] reserved[freeString]', {
formattedReserved,
freeString: free
? tct(' + [formattedFree] gifted', {formattedFree})
: '',
})
}
/>
)}
{isUnlimited ? UNLIMITED : formattedTotal}{' '}
</Text>
</Flex>
);
Expand All @@ -620,12 +579,58 @@ function UsageOverviewTable({subscription, organization, usageData}: UsageOvervi
return <Text>{UNLIMITED}</Text>;
}

const percentUsed = reservedUsage;
if (defined(percentUsed)) {
const formattedReserved = addOnCategory
? displayPriceWithCents({cents: reserved ?? 0})
: dataCategory
? formatReservedWithUnits(reserved ?? 0, dataCategory, {
useUnitScaling: true,
})
: (reserved ?? 0);
const formattedFree = addOnCategory
? displayPriceWithCents({cents: free ?? 0})
: dataCategory
? formatReservedWithUnits(free ?? 0, dataCategory, {
useUnitScaling: true,
})
: (free ?? 0);
const formattedReservedTotal = addOnCategory
? displayPriceWithCents({cents: (reserved ?? 0) + (free ?? 0)})
: dataCategory
? formatReservedWithUnits(
(reserved ?? 0) + (free ?? 0),
dataCategory,
{
useUnitScaling: true,
}
)
: (reserved ?? 0) + (free ?? 0);

return (
<Flex gap="sm" align="center">
<ReservedUsageBar percentUsed={percentUsed / 100} />
<Text>{percentUsed.toFixed(0) + '%'}</Text>
<Text>
{tct('[percent]% of [formattedReservedTotal]', {
percent: percentUsed.toFixed(0),
formattedReservedTotal,
})}
</Text>
{
<QuestionTooltip
size="xs"
position="top"
title={
isUnlimited
? t('Unlimited usage during your product trial')
: tct('[formattedReserved] reserved[freeString]', {
formattedReserved,
freeString: free
? tct(' + [formattedFree] gifted', {formattedFree})
: '',
})
}
/>
}
</Flex>
);
}
Expand Down
Loading