Skip to content

feat(billing): use Subscription.orgRetention in customerOverview #103124

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

Open
wants to merge 1 commit into
base: vbro_add_orgretention_to_subscription
Choose a base branch
from
+41 −1
Open

feat(billing): use Subscription.orgRetention in customerOverview #103124

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
38 changes: 38 additions & 0 deletions static/gsAdmin/components/customers/customerOverview.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,4 +692,42 @@ describe('CustomerOverview', () => {
expect(screen.getByText('null')).toBeInTheDocument();
expect(screen.queryByText('36925')).not.toBeInTheDocument();
});

it('renders org retention', () => {
const organization = OrganizationFixture({});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_f',
orgRetention: {standard: 1234567, downsampled: null},
});

render(
<CustomerOverview
customer={subscription}
onAction={jest.fn()}
organization={organization}
/>
);

expect(screen.getByText('1234567d')).toBeInTheDocument();
});

it('renders org retention default', () => {
const organization = OrganizationFixture({});
const subscription = SubscriptionFixture({
organization,
plan: 'am3_f',
orgRetention: {standard: null, downsampled: null},
});

render(
<CustomerOverview
customer={subscription}
onAction={jest.fn()}
organization={organization}
/>
);

expect(screen.getByText('90d')).toBeInTheDocument();
});
});
4 changes: 3 additions & 1 deletion static/gsAdmin/components/customers/customerOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,9 @@ function CustomerOverview({customer, onAction, organization}: Props) {
<DetailLabel title="Internal ID">{customer.id}</DetailLabel>
<DetailLabel title="Data Storage Location">{region}</DetailLabel>
<DetailLabel title="Data Retention">
{customer.dataRetention || '90d'}
{customer.orgRetention?.standard
? `${customer.orgRetention?.standard}d`
: '90d'}
Copy link
Contributor

@cursor cursor bot Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Conditional Logic Misinterprets Zero

The conditional checks if customer.orgRetention?.standard is truthy, which fails when standard is 0 (a valid retention value). This causes 0 to incorrectly fall back to '90d' instead of displaying '0d'. Use customer.orgRetention?.standard != null or defined() to properly handle zero values.

Fix in Cursor Fix in Web

</DetailLabel>
<DetailLabel title="Joined">
{moment(customer.dateJoined).fromNow()}
Expand Down
Loading