Skip to content

ref(billing): Remove usage of deprecatedRouteProps for subscription overview route #105698

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 subscription overview route #105698

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 @@ -42,7 +42,6 @@ const settingsRoutes = (): SentryRouteObject => ({
path: 'overview/',
name: 'Overview',
component: make(() => import('../views/subscriptionPage/overview')),
deprecatedRouteProps: true,
},
{
path: 'usage/',
Expand Down
83 changes: 42 additions & 41 deletions static/gsApp/views/subscriptionPage/overview.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {LocationFixture} from 'sentry-fixture/locationFixture';
import {OrganizationFixture} from 'sentry-fixture/organization';

import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
Expand Down Expand Up @@ -29,7 +28,6 @@ import Overview from 'getsentry/views/subscriptionPage/overview';

describe('Subscription > Overview', () => {
const organization = OrganizationFixture({access: ['org:billing']});
const mockLocation = LocationFixture();

beforeEach(() => {
organization.features = [];
Expand Down Expand Up @@ -165,7 +163,7 @@ describe('Subscription > Overview', () => {
const subscription = SubscriptionFixture({organization, plan: 'am3_business'});
SubscriptionStore.set(organization.slug, subscription);
organization.features = ['subscriptions-v3'];
render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});
expect(
await screen.findByRole('heading', {name: 'Subscription'})
).toBeInTheDocument();
Expand All @@ -184,7 +182,7 @@ describe('Subscription > Overview', () => {
const subscription = Am3DsEnterpriseSubscriptionFixture({organization});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -201,7 +199,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -221,7 +219,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -237,7 +235,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, seerSubscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -255,7 +253,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -280,7 +278,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -296,7 +294,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -312,7 +310,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -328,7 +326,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(screen.queryByTestId('unsupported-plan')).not.toBeInTheDocument();
Expand All @@ -345,7 +343,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(
Expand All @@ -364,7 +362,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {
render(<Overview />, {
organization: billingOrg,
});

Expand All @@ -380,7 +378,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByTestId('trial-alert')).toBeInTheDocument();
});
Expand All @@ -392,7 +390,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(screen.queryByTestId('trial-alert')).not.toBeInTheDocument();
Expand All @@ -413,7 +411,7 @@ describe('Subscription > Overview', () => {
},
});
SubscriptionStore.set(organization.slug, subscription);
render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});
renderGlobalModal();

expect(
Expand All @@ -436,7 +434,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('On-Demand Max Spend')).toBeInTheDocument();
});
Expand All @@ -450,7 +448,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(screen.queryByText('On-Demand Max Spend')).not.toBeInTheDocument();
Expand All @@ -465,7 +463,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(screen.queryByText('On-Demand Max Spend')).not.toBeInTheDocument();
Expand All @@ -480,7 +478,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(screen.queryByText('On-Demand Max Spend')).not.toBeInTheDocument();
Expand All @@ -501,7 +499,7 @@ describe('Subscription > Overview', () => {

it('renders pending changes', async () => {
SubscriptionStore.set(organization.slug, subscription);
render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(
await screen.findByText(/The following changes will take effect on/)
Expand All @@ -520,7 +518,7 @@ describe('Subscription > Overview', () => {
body: planMigrations,
});

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(
await screen.findByText(textWithMarkupMatcher("We're updating our Team Plan"))
Expand All @@ -547,7 +545,7 @@ describe('Subscription > Overview', () => {
body: planMigrations,
});

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(
await screen.findByText(/The following changes will take effect on/)
Expand All @@ -567,7 +565,7 @@ describe('Subscription > Overview', () => {

it('renders empty', async () => {
SubscriptionStore.set(organization.slug, subscription);
render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(screen.queryByTestId('recurring-credits-panel')).not.toBeInTheDocument();
Expand All @@ -581,7 +579,7 @@ describe('Subscription > Overview', () => {
body: [RecurringCreditFixture()],
});

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByTestId('recurring-credits-panel')).toBeInTheDocument();

Expand All @@ -607,7 +605,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {
render(<Overview />, {
organization: billingOrg,
});

Expand All @@ -631,7 +629,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {
render(<Overview />, {
organization: billingOrg,
});

Expand Down Expand Up @@ -659,7 +657,7 @@ describe('Subscription > Overview', () => {
expect('onDemandBudgets' in subscription).toBe(false);
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(await screen.findByText('On-Demand Max Spend')).toBeInTheDocument();
expect(screen.queryByText('on-demand budget')).not.toBeInTheDocument();
Expand Down Expand Up @@ -688,7 +686,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(
await screen.findByRole('button', {name: 'Set Up Pay-as-you-go'})
Expand Down Expand Up @@ -719,7 +717,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(
await screen.findByText(
Expand Down Expand Up @@ -750,7 +748,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(
await screen.findByText(
Expand Down Expand Up @@ -782,7 +780,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
expect(
Expand All @@ -804,7 +802,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(await screen.findByTestId('usage-chart')).toBeInTheDocument();
expect(screen.queryByTestId('recurring-credits-panel')).not.toBeInTheDocument();
Expand All @@ -824,7 +822,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(billingOrg.slug, subscription);

render(<Overview location={mockLocation} />, {organization: billingOrg});
render(<Overview />, {organization: billingOrg});

expect(await screen.findByTestId('permission-denied')).toBeInTheDocument();
expect(screen.queryByTestId('usage-chart')).not.toBeInTheDocument();
Expand All @@ -844,12 +842,15 @@ describe('Subscription > Overview', () => {
organization,
});
SubscriptionStore.set(organization.slug, subscription);
const location = LocationFixture({
query: {open_codecov_modal: '1'},
});

render(<Overview location={location} />, {
render(<Overview />, {
organization,
initialRouterConfig: {
location: {
pathname: '/settings/billing/overview/',
query: {open_codecov_modal: '1'},
},
},
});
renderGlobalModal();

Expand All @@ -864,7 +865,7 @@ describe('Subscription > Overview', () => {
});
SubscriptionStore.set(organization.slug, subscription);

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(await screen.findByText('Overview')).toBeInTheDocument();
expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
Expand Down Expand Up @@ -916,7 +917,7 @@ describe('Subscription > Overview', () => {
},
});

render(<Overview location={mockLocation} />, {organization});
render(<Overview />, {organization});

expect(mockApi).toHaveBeenCalled();

Expand Down
6 changes: 3 additions & 3 deletions static/gsApp/views/subscriptionPage/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Fragment, useEffect} from 'react';
import type {Location} from 'history';

import {Flex} from 'sentry/components/core/layout';
import {ExternalLink} from 'sentry/components/core/link';
Expand All @@ -11,6 +10,7 @@ import {t, tct} from 'sentry/locale';
import {DataCategory} from 'sentry/types/core';
import {useApiQuery} from 'sentry/utils/queryClient';
import useApi from 'sentry/utils/useApi';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import useOrganization from 'sentry/utils/useOrganization';

Expand Down Expand Up @@ -50,17 +50,17 @@ import UsageAlert from './usageAlert';
import {CombinedUsageTotals, UsageTotals} from './usageTotals';

type Props = {
location: Location;
promotionData: PromotionData;
subscription: Subscription;
};

/**
* Subscription overview page.
*/
function Overview({location, subscription, promotionData}: Props) {
function Overview({subscription, promotionData}: Props) {
const api = useApi();
const organization = useOrganization();
const location = useLocation();
const isNewBillingUI = hasNewBillingUI(organization);
const navigate = useNavigate();

Expand Down
Loading