Skip to content

ref(billing): Remove usage of deprecatedRouteProps for UsageHistory component #105697

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
shashjar merged 1 commit into from
Jan 6, 2026
Merged

ref(billing): Remove usage of deprecatedRouteProps for UsageHistory component #105697

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
1 change: 0 additions & 1 deletion static/gsApp/hooks/settingsRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const settingsRoutes = (): SentryRouteObject => ({
path: 'usage/',
name: 'Usage History',
component: make(() => import('../views/subscriptionPage/usageHistory')),
deprecatedRouteProps: true,
},
{
path: 'receipts/',
Expand Down
49 changes: 24 additions & 25 deletions static/gsApp/views/subscriptionPage/usageHistory.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {OrganizationFixture} from 'sentry-fixture/organization';
import {RouteComponentPropsFixture} from 'sentry-fixture/routeComponentPropsFixture';

import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
import {BillingHistoryFixture} from 'getsentry-test/fixtures/billingHistory';
Expand Down Expand Up @@ -69,7 +68,7 @@ describe('Subscription > UsageHistory', () => {
const subscription = SubscriptionFixture({organization});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(await screen.findByTestId('history-expand')).toBeInTheDocument();
expect(
screen.queryByRole('heading', {name: /Usage History/i})
Expand All @@ -86,7 +85,7 @@ describe('Subscription > UsageHistory', () => {
const subscription = SubscriptionFixture({organization});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(
await screen.findByRole('heading', {name: /Usage History/i})
).toBeInTheDocument();
Expand All @@ -107,7 +106,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(org.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization: org});
render(<UsageHistory />, {organization: org});
expect(await screen.findByTestId('permission-denied')).toBeInTheDocument();
});

Expand All @@ -125,7 +124,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(screen.queryByTestId('permission-denied')).not.toBeInTheDocument();
expect(mockCall).toHaveBeenCalled();
});
Expand All @@ -144,7 +143,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(mockCall).toHaveBeenCalled();

// Expand button should be present.
Expand Down Expand Up @@ -176,7 +175,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(screen.queryByText('On-Demand Spend')).not.toBeInTheDocument();
expect(mockCall).toHaveBeenCalled();
Expand Down Expand Up @@ -218,7 +217,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(await screen.findByText('>100%')).toBeInTheDocument();
expect(screen.queryByText('Gifted')).not.toBeInTheDocument();
expect(screen.getByRole('cell', {name: '1 GB'})).toBeInTheDocument();
Expand Down Expand Up @@ -261,7 +260,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});
expect(await screen.findByText('Gifted')).toBeInTheDocument();
expect(screen.queryByText('>100%')).not.toBeInTheDocument();
expect(screen.queryByRole('cell', {name: '∞'})).not.toBeInTheDocument();
Expand Down Expand Up @@ -303,7 +302,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Shared On-demand should show up
expect(await screen.findByText('On-Demand Spend (Shared)')).toBeInTheDocument();
Expand Down Expand Up @@ -355,7 +354,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Per-category On-demand should show up
expect(await screen.findByText('On-Demand Spend (Per-Category)')).toBeInTheDocument();
Expand Down Expand Up @@ -389,7 +388,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(await screen.findByText('On-Demand Spend (Shared)')).toBeInTheDocument();
expect(
Expand Down Expand Up @@ -432,7 +431,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Per-category Soft Cap On-demand should show up
expect(await screen.findAllByText('Errors (On-Demand)')).toHaveLength(2);
Expand Down Expand Up @@ -475,7 +474,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Per-category Soft Cap True Forward should show up
expect(await screen.findAllByText('Errors (True Forward)')).toHaveLength(2);
Expand Down Expand Up @@ -519,7 +518,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Per-category True Forward should show up
expect(await screen.findAllByText('Errors (True Forward)')).toHaveLength(2);
Expand Down Expand Up @@ -561,7 +560,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -605,7 +604,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand All @@ -629,7 +628,7 @@ describe('Subscription > UsageHistory', () => {
const subscription = SubscriptionFixture({organization, plan: 'am2_f'});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand All @@ -650,7 +649,7 @@ describe('Subscription > UsageHistory', () => {
const subscription = SubscriptionFixture({organization, plan: 'am1_f'});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -691,7 +690,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -731,7 +730,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -774,7 +773,7 @@ describe('Subscription > UsageHistory', () => {
const subscription = Am3DsEnterpriseSubscriptionFixture({organization});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -817,7 +816,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

expect(
await screen.findByRole('row', {
Expand Down Expand Up @@ -861,7 +860,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Should show 2% (100/6000 * 100)
expect(await screen.findByText(/UI Profile Hours/i)).toBeInTheDocument();
Expand Down Expand Up @@ -896,7 +895,7 @@ describe('Subscription > UsageHistory', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
render(<UsageHistory />, {organization});

// Should show >100% when usage exceeds prepaid limit
expect(await screen.findByText(/UI Profile Hours/i)).toBeInTheDocument();
Expand Down
3 changes: 1 addition & 2 deletions static/gsApp/views/subscriptionPage/usageHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
import {IconChevron, IconDownload} from 'sentry/icons';
import {t, tct} from 'sentry/locale';
import {DataCategory} from 'sentry/types/core';
import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
import {formatPercentage} from 'sentry/utils/number/formatPercentage';
import {useApiQuery} from 'sentry/utils/queryClient';
import {useLocation} from 'sentry/utils/useLocation';
Expand Down Expand Up @@ -52,7 +51,7 @@ import SubscriptionPageContainer from 'getsentry/views/subscriptionPage/componen
import {StripedTable} from './styles';
import SubscriptionHeader from './subscriptionHeader';

interface Props extends RouteComponentProps<unknown, unknown> {
interface Props {
subscription: Subscription;
}

Expand Down
Loading