Skip to content

ref: Remove PlanTier prop from subscription #117881

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
noahsmartin merged 2 commits into from
Jun 16, 2026
Merged

ref: Remove PlanTier prop from subscription #117881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6498468
ref: Remove PlanTier prop from subscription
noahsmartin Jun 16, 2026
51ce5c2
remove trialTier
noahsmartin Jun 16, 2026
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
2 changes: 0 additions & 2 deletions static/gsAdmin/components/changePlanAction.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe('ChangePlanAction', () => {
const mockOrg = OrganizationFixture({slug: 'org-slug'});
const subscription = SubscriptionFixture({
organization: mockOrg,
planTier: PlanTier.AM3,
plan: 'am3_business',
billingInterval: 'monthly',
contractInterval: 'monthly',
Expand Down Expand Up @@ -264,7 +263,6 @@ describe('ChangePlanAction', () => {
// Create subscription with Seer budget
const subscriptionWithSeer = SubscriptionWithLegacySeerFixture({
organization: mockOrg,
planTier: PlanTier.AM3,
plan: 'am3_business',
});

Expand Down
4 changes: 2 additions & 2 deletions static/gsAdmin/components/customerStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ type Props = {

const getLabel = (item: Subscription) => {
if (item.isEnterpriseTrial) {
return `Trialing (${item.trialTier} enterprise)`;
return `Trialing (${item.trialPlan} enterprise)`;
}
if (item.isTrial) {
return `Trialing (${item.trialTier})`;
return `Trialing (${item.trialPlan})`;
Comment thread
noahsmartin marked this conversation as resolved.
}
if (item.isFree) {
return 'Free Account';
Expand Down
5 changes: 0 additions & 5 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 @@ -8,7 +8,6 @@ import {
SubscriptionFixture,
SubscriptionWithLegacySeerFixture,
} from 'getsentry-test/fixtures/subscription';
import {PlanTier} from 'getsentry-test/planTier';
import {
render,
screen,
Expand Down Expand Up @@ -376,7 +375,6 @@ describe('CustomerOverview', () => {
const enterprise_subscription = InvoicedSubscriptionFixture({
organization,
plan: 'am3_business_ent_auf',
planTier: PlanTier.AM3,
});

render(
Expand All @@ -403,7 +401,6 @@ describe('CustomerOverview', () => {
const subscription = SubscriptionFixture({
organization,
plan: 'am3_f',
planTier: PlanTier.AM3,
});

render(
Expand All @@ -427,7 +424,6 @@ describe('CustomerOverview', () => {
const am3Subscription = SubscriptionFixture({
organization,
plan: 'am3_f',
planTier: PlanTier.AM3,
productTrials: [
{
category: DataCategory.REPLAYS,
Expand Down Expand Up @@ -604,7 +600,6 @@ describe('CustomerOverview', () => {
const am3Subscription = SubscriptionFixture({
organization,
plan: 'am3_team',
planTier: PlanTier.AM3,
});

MockApiClient.addMockResponse({
Expand Down
1 change: 0 additions & 1 deletion static/gsAdmin/views/customerDetails.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,6 @@ describe('Customer Details', () => {
const subscription = SubscriptionFixture({
organization,
plan: 'am3_f',
planTier: 'am3',
});
subscription.reservedBudgets = [
SeerReservedBudgetFixture({
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ describe('InsightsUpsellPage', () => {
organization,
plan: 'am3_team',
isFree: true,
planTier: PlanTier.AM3,
});

beforeEach(() => {
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/components/performance/quotaExceededAlert.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ describe('Renders QuotaExceededAlert correctly for spans', () => {
onDemandBudgets: {
enabled: true,
} as any,
planTier: 'am1' as any,
categories: {
spans: {
usageExceeded: spansUsageExceeded,
Expand Down
3 changes: 0 additions & 3 deletions static/gsApp/components/profiling/profilingUpgradeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ function UpsellModal(props: Props) {
useEffect(() => {
trackGetsentryAnalytics('upgrade_now.modal.viewed', {
organization,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down Expand Up @@ -219,7 +218,6 @@ function ActionButtons({

trackGetsentryAnalytics('upgrade_now.modal.update_now', {
organization,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand All @@ -243,7 +241,6 @@ function ActionButtons({
trackGetsentryAnalytics('upgrade_now.modal.manage_sub', {
organization,
surface: 'profiling',
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down
4 changes: 0 additions & 4 deletions static/gsApp/components/replayOnboardingCTA.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ function ReplayOnboardingCTAUpsell({
trackGetsentryAnalytics('replay.list_page.viewed', {
organization,
surface: 'replay_onboarding_banner',
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand All @@ -67,7 +66,6 @@ function ReplayOnboardingCTAUpsell({
trackGetsentryAnalytics('replay.list_page.sent_email', {
organization,
surface: 'replay_onboarding_banner',
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down Expand Up @@ -112,7 +110,6 @@ function ReplayOnboardingCTAUpsell({
trackGetsentryAnalytics('replay.list_page.open_modal', {
organization,
surface: 'replay_onboarding_banner',
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: hasBillingAccess,
Expand Down Expand Up @@ -156,7 +153,6 @@ function ReplayOnboardingCTAUpsell({
trackGetsentryAnalytics('replay.list_page.manage_sub', {
organization,
surface: 'replay_onboarding_banner',
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down
3 changes: 0 additions & 3 deletions static/gsApp/components/upgradeNowModal/actionButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export function ActionButtons({

trackGetsentryAnalytics('upgrade_now.modal.update_now', {
organization,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down Expand Up @@ -101,7 +100,6 @@ export function ActionButtons({
trackGetsentryAnalytics('upgrade_now.modal.sent_email', {
organization,
surface,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand All @@ -123,7 +121,6 @@ export function ActionButtons({
trackGetsentryAnalytics('upgrade_now.modal.manage_sub', {
organization,
surface,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/components/upgradeNowModal/modalSamePrice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function UpgradeNowModal({

trackGetsentryAnalytics('upgrade_now.modal.update_now', {
organization,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/components/upgradeNowModal/useLogUpgradeNowViewed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export function useLogUpgradeNowViewed({
useEffect(() => {
trackGetsentryAnalytics('upgrade_now.modal.viewed', {
organization,
planTier: subscription.planTier,
canSelfServe: subscription.canSelfServe,
channel: subscription.channel,
has_billing_scope: organization.access?.includes('org:billing'),
Expand Down
3 changes: 1 addition & 2 deletions static/gsApp/components/withSubscription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,11 @@ export function withSubscription<P extends InjectedSubscriptionProps>(
private mounted = false;

configureScopeWithSubscriptionData(subscription: Subscription) {
const {plan, planTier, totalMembers, planDetails} = subscription;
const {plan, totalMembers, planDetails} = subscription;
Sentry.setTag('plan', plan);
Sentry.setTag('plan.name', planDetails?.name);
Sentry.setTag('plan.max_members', `${planDetails?.maxMembers}`);
Sentry.setTag('plan.total_members', `${totalMembers}`);
Sentry.setTag('plan.tier', planTier);
}

onSubscriptionChange(subscription: Subscription) {
Expand Down
2 changes: 0 additions & 2 deletions static/gsApp/types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ export type Subscription = {
// Subscription details
plan: string;
planDetails: Plan;
planTier: string;
/**
* Total events allowed for the current usage period including gifted
*/
Expand All @@ -413,7 +412,6 @@ export type Subscription = {
totalProjects: number | null;
trialEnd: string | null;
trialPlan: string | null;
trialTier: string | null;
type: BillingType;
/**
* All quotas available on the plan are exceeded
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/utils/pendo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ export function getPendoAccountFields(
'canTrial',
'canSelfServe',
'plan',
'planTier',
]),
...pick(organization, ['isEarlyAdopter']),
};
Expand Down
2 changes: 1 addition & 1 deletion static/gsApp/utils/trackGetsentryAnalytics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export type AM2UpdateSurfaces =
| 'replay_project_creation'
| 'replay'
| 'subscription_page';
type UpdateProps = Pick<Subscription, 'planTier' | 'canSelfServe' | 'channel'> & {
type UpdateProps = Pick<Subscription, 'canSelfServe' | 'channel'> & {
has_billing_scope: boolean;
surface: AM2UpdateSurfaces;
};
Expand Down
10 changes: 0 additions & 10 deletions static/gsApp/views/amCheckout/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ describe('Legacy Tier Checkout', () => {
const am2BizSubscription = SubscriptionFixture({
organization,
plan: 'am2_business_bundle',
planTier: 'am2',
categories: {
errors: MetricHistoryFixture({reserved: 100_000}),
transactions: MetricHistoryFixture({reserved: 20_000_000}),
Expand Down Expand Up @@ -237,7 +236,6 @@ describe('Default Tier Checkout', () => {
organization,
contractPeriodEnd: contractPeriodEnd.toISOString(),
plan: 'am2_sponsored_team_auf',
planTier: PlanTier.AM2,
isSponsored: true,
partner: {
isActive: true,
Expand Down Expand Up @@ -285,7 +283,6 @@ describe('Default Tier Checkout', () => {
organization,
contractPeriodEnd: contractPeriodEnd.toISOString(),
plan: 'am3_f',
planTier: PlanTier.AM3,
isSelfServePartner: true,
partner: {
isActive: true,
Expand Down Expand Up @@ -329,7 +326,6 @@ describe('Default Tier Checkout', () => {
organization,
contractPeriodEnd: contractPeriodEnd.toISOString(),
plan: 'am3_f',
planTier: PlanTier.AM3,
isSelfServePartner: true,
partner: {
isActive: true,
Expand Down Expand Up @@ -372,7 +368,6 @@ describe('Default Tier Checkout', () => {
organization,
contractPeriodEnd: contractPeriodEnd.toISOString(),
plan: 'am3_f',
planTier: PlanTier.AM3,
isSelfServePartner: true,
partner: {
isActive: true,
Expand Down Expand Up @@ -413,7 +408,6 @@ describe('Default Tier Checkout', () => {
organization,
// This plan does not have hasOnDemandModes
plan: 'mm2_b_100k',
planTier: PlanTier.AM2,
});
SubscriptionStore.set(organization.slug, sub);

Expand All @@ -440,7 +434,6 @@ describe('Default Tier Checkout', () => {
const sub = SubscriptionFixture({
organization,
plan: 'am3_business',
planTier: PlanTier.AM3,
onDemandBudgets: {
onDemandSpendUsed: 0,
sharedMaxBudget: 2000,
Expand Down Expand Up @@ -501,7 +494,6 @@ describe('Default Tier Checkout', () => {
const sub = SubscriptionFixture({
organization,
plan: 'am3_business',
planTier: PlanTier.AM3,
onDemandBudgets: {
onDemandSpendUsed: 0,
sharedMaxBudget: 2000,
Expand Down Expand Up @@ -561,7 +553,6 @@ describe('Default Tier Checkout', () => {
const sub = SubscriptionFixture({
organization,
plan: 'am3_business',
planTier: PlanTier.AM3,
categories: {
// Intentionally omitting 'errors' and 'attachments' categories
replays: MetricHistoryFixture({reserved: 50}),
Expand Down Expand Up @@ -706,7 +697,6 @@ describe('Default Tier Checkout', () => {
const trialSub = SubscriptionFixture({
organization,
plan: 'am3_t',
planTier: PlanTier.AM3,
isTrial: true, // This is true for both subscription trials and plan trials
categories: {
// These are high trial volumes that should NOT be used in checkout
Expand Down
1 change: 0 additions & 1 deletion static/gsApp/views/amCheckout/steps/reserveAdditionalVolume.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ describe('ReserveAdditionalVolume', () => {
const trialSub = SubscriptionFixture({
organization,
plan: 'am3_t',
planTier: PlanTier.AM3,
isTrial: true, // This is true for both subscription trials and plan trials
categories: {
// These are high trial volumes that should NOT be used in checkout
Expand Down
2 changes: 0 additions & 2 deletions static/gsApp/views/amCheckout/steps/setSpendLimit.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ describe('SetSpendLimit', () => {
const sub = SubscriptionFixture({
organization,
plan: 'am3_f',
planTier: PlanTier.AM3,
});
SubscriptionStore.set(organization.slug, sub);
render(
Expand Down Expand Up @@ -86,7 +85,6 @@ describe('SetSpendLimit', () => {
const sub = SubscriptionFixture({
organization: preAm3Organization,
plan: 'am2_team',
planTier: PlanTier.AM2,
});
SubscriptionStore.set(preAm3Organization.slug, sub);
render(
Expand Down
Loading
Loading