Remove trial selection tier (#117865)

The enable enterprise trial modal had this tier dropdown. It's redundant
because the backend already picks the appropriate tier for an enterprise
trial (if the field is not supplied from the FE) and rejects if a wrong
one was specified.

Author: noahsmartin

static/gsAdmin/components/changePlanAction.spec.tsx

@@ -7,6 +7,7 @@ import {
   SubscriptionFixture,
   SubscriptionWithLegacySeerFixture,
 } from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {renderGlobalModal, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 import {selectEvent} from 'sentry-test/selectEvent';
 
@@ -15,7 +16,6 @@ import {DataCategory} from 'sentry/types/core';
 
 import {triggerChangePlanAction} from 'admin/components/changePlanAction';
 import {SubscriptionStore} from 'getsentry/stores/subscriptionStore';
-import {PlanTier} from 'getsentry/types';
 
 describe('ChangePlanAction', () => {
   const mockOrg = OrganizationFixture({slug: 'org-slug'});

static/gsAdmin/components/customers/customerOverview.spec.tsx

@@ -8,6 +8,7 @@ import {
   SubscriptionFixture,
   SubscriptionWithLegacySeerFixture,
 } from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {
   render,
   screen,
@@ -20,7 +21,7 @@ import {DataCategory} from 'sentry/types/core';
 import {toTitleCase} from 'sentry/utils/string/toTitleCase';
 
 import {CustomerOverview} from 'admin/components/customers/customerOverview';
-import {AddOnCategory, PlanTier} from 'getsentry/types';
+import {AddOnCategory} from 'getsentry/types';
 
 describe('CustomerOverview', () => {
   it('renders DetailLabels for SubscriptionSummary section', () => {

static/gsAdmin/components/provisionSubscriptionAction.spec.tsx

@@ -6,6 +6,7 @@ import {
   InvoicedSubscriptionFixture,
   SubscriptionFixture,
 } from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {
   fireEvent,
   renderGlobalModal,
@@ -20,7 +21,7 @@ import {DataCategory} from 'sentry/types/core';
 
 import {triggerProvisionSubscription} from 'admin/components/provisionSubscriptionAction';
 import {RESERVED_BUDGET_QUOTA} from 'getsentry/constants';
-import {OnDemandBudgetMode, PlanTier} from 'getsentry/types';
+import {OnDemandBudgetMode} from 'getsentry/types';
 
 describe('provisionSubscriptionAction', () => {
   const onSuccess = jest.fn();

static/gsAdmin/components/trialSubscriptionAction.spec.tsx

@@ -2,16 +2,10 @@ import moment from 'moment-timezone';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
-import {
-  renderGlobalModal,
-  screen,
-  userEvent,
-  within,
-} from 'sentry-test/reactTestingLibrary';
+import {renderGlobalModal, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import {openAdminConfirmModal} from 'admin/components/adminConfirmationModal';
 import {TrialSubscriptionAction} from 'admin/components/trialSubscriptionAction';
-import {PlanTier} from 'getsentry/types';
 
 describe('TrialSubscriptionAction', () => {
   const organization = OrganizationFixture();
@@ -75,7 +69,6 @@ describe('TrialSubscriptionAction', () => {
     expect(onConfirm).toHaveBeenCalledWith({
       trialDays: 45,
       startEnterpriseTrial: true,
-      trialTier: PlanTier.AM3,
     });
   });
 
@@ -219,87 +212,6 @@ describe('TrialSubscriptionAction', () => {
     );
   });
 
-  it('displays am3 trial tier option when free plan', async () => {
-    jest.mock('@sentry/scraps/alert');
-
-    openAdminConfirmModal({
-      onConfirm,
-      renderModalSpecificContent: deps => (
-        <TrialSubscriptionAction
-          subscription={SubscriptionFixture({
-            organization,
-            plan: 'am2_f',
-            isFree: true,
-            planTier: PlanTier.AM2,
-          })}
-          startEnterpriseTrial
-          {...deps}
-        />
-      ),
-    });
-
-    renderGlobalModal();
-
-    await userEvent.click(screen.getByTestId('trial-plan-tier-choices'));
-    const trialTierInputs = within(screen.getByRole('dialog')).getAllByRole('textbox');
-    await userEvent.click(trialTierInputs[1]!);
-    expect(screen.getByText('am3')).toBeInTheDocument();
-  });
-
-  it('displays am3 trial tier option when am3 plan', async () => {
-    jest.mock('@sentry/scraps/alert');
-
-    openAdminConfirmModal({
-      onConfirm,
-      renderModalSpecificContent: deps => (
-        <TrialSubscriptionAction
-          subscription={SubscriptionFixture({
-            organization,
-            plan: 'am3_team',
-            isFree: false,
-            planTier: PlanTier.AM3,
-          })}
-          startEnterpriseTrial
-          {...deps}
-        />
-      ),
-    });
-
-    renderGlobalModal();
-
-    await userEvent.click(screen.getByTestId('trial-plan-tier-choices'));
-    const trialTierInputs = within(screen.getByRole('dialog')).getAllByRole('textbox');
-    await userEvent.click(trialTierInputs[1]!);
-    expect(screen.getByText('am3')).toBeInTheDocument();
-  });
-
-  it('displays am3 trial tier option when am2 plan', async () => {
-    jest.mock('@sentry/scraps/alert');
-
-    openAdminConfirmModal({
-      onConfirm,
-      renderModalSpecificContent: deps => (
-        <TrialSubscriptionAction
-          subscription={SubscriptionFixture({
-            organization,
-            plan: 'am2_team',
-            isFree: false,
-            planTier: PlanTier.AM2,
-          })}
-          startEnterpriseTrial
-          {...deps}
-        />
-      ),
-    });
-
-    renderGlobalModal();
-
-    await userEvent.click(screen.getByTestId('trial-plan-tier-choices'));
-    const trialTierInputs = within(screen.getByRole('dialog')).getAllByRole('textbox');
-    await userEvent.click(trialTierInputs[1]!);
-    expect(screen.getByText('am3')).toBeInTheDocument();
-  });
-
   it('defaults 14-day trial for self-serve', () => {
     jest.mock('@sentry/scraps/alert');
 

static/gsAdmin/components/trialSubscriptionAction.tsx

@@ -4,14 +4,12 @@ import moment from 'moment-timezone';
 import {Alert} from '@sentry/scraps/alert';
 
 import {NumberField} from 'sentry/components/forms/fields/numberField';
-import {SelectField} from 'sentry/components/forms/fields/selectField';
 
 import type {
   AdminConfirmParams,
   AdminConfirmRenderProps,
 } from 'admin/components/adminConfirmationModal';
 import type {Subscription} from 'getsentry/types';
-import {PlanTier} from 'getsentry/types';
 
 type Props = AdminConfirmRenderProps & {
   subscription: Subscription;
@@ -20,7 +18,6 @@ type Props = AdminConfirmRenderProps & {
 
 type State = {
   trialDays: number;
-  trialTier?: PlanTier;
 };
 
 /**
@@ -32,26 +29,24 @@ export class TrialSubscriptionAction extends Component<Props, State> {
       this.props.subscription.isEnterpriseTrial || this.props.startEnterpriseTrial
         ? 28
         : 14,
-    trialTier: PlanTier.AM3,
   };
 
   componentDidMount() {
     this.props.setConfirmCallback(this.handleConfirm);
   }
 
   handleConfirm = (_params: AdminConfirmParams) => {
-    const {trialDays, trialTier} = this.state;
+    const {trialDays} = this.state;
     const {startEnterpriseTrial, onConfirm} = this.props;
 
     // XXX(epurkhiser): In the original implementation none of the audit params
     // were passed, is that an oversight?
-
+    //
+    // The trial tier is resolved server-side (omitting `trialTier` falls back
+    // to the subscription's default enterprise-trial plan).
     const data = {
       trialDays,
-      ...(startEnterpriseTrial && {
-        startEnterpriseTrial,
-        trialTier,
-      }),
+      ...(startEnterpriseTrial && {startEnterpriseTrial}),
     };
 
     onConfirm?.(data);
@@ -74,7 +69,7 @@ export class TrialSubscriptionAction extends Component<Props, State> {
 
   render() {
     const {subscription, startEnterpriseTrial} = this.props;
-    const {trialDays, trialTier} = this.state;
+    const {trialDays} = this.state;
 
     if (!subscription) {
       return null;
@@ -85,12 +80,6 @@ export class TrialSubscriptionAction extends Component<Props, State> {
     );
     const trialEndDate = currentTrialEnd.add(trialDays, 'days').format('MMMM Do YYYY');
 
-    const tierChoices: Array<[string | PlanTier, string | PlanTier]> = [
-      [PlanTier.AM3, PlanTier.AM3],
-      [PlanTier.AM2, PlanTier.AM2],
-      [PlanTier.AM1, PlanTier.AM1],
-    ];
-
     return (
       <Fragment>
         {startEnterpriseTrial && (
@@ -114,22 +103,6 @@ export class TrialSubscriptionAction extends Component<Props, State> {
           value={trialDays}
           onChange={this.onDaysChange}
         />
-        <div data-test-id="trial-plan-tier-choices">
-          {startEnterpriseTrial && (
-            <SelectField
-              inline={false}
-              stacked
-              flexibleControlStateSize
-              label="Trial Plan Tier"
-              name="tier"
-              value={trialTier}
-              onChange={(val: any) => {
-                this.setState({trialTier: val});
-              }}
-              choices={tierChoices}
-            />
-          )}
-        </div>
       </Fragment>
     );
   }

static/gsAdmin/views/customerDetails.spec.tsx

@@ -14,6 +14,7 @@ import {PoliciesFixture} from 'getsentry-test/fixtures/policies';
 import {ProjectFixture} from 'getsentry-test/fixtures/project';
 import {SeerReservedBudgetFixture} from 'getsentry-test/fixtures/reservedBudget';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {initializeOrg} from 'sentry-test/initializeOrg';
 import {
   render,
@@ -35,7 +36,7 @@ import type {StatsGroup} from 'admin/components/customers/customerStats';
 import {populateChartData, useSeries} from 'admin/components/customers/customerStats';
 import {CustomerDetails} from 'admin/views/customerDetails';
 import type {Subscription} from 'getsentry/types';
-import {BillingType, PlanTier} from 'getsentry/types';
+import {BillingType} from 'getsentry/types';
 
 const theme = ThemeFixture();
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;

static/gsApp/components/crons/cronsBillingBanner.spec.tsx

@@ -4,10 +4,10 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
 import {PlanDetailsLookupFixture} from 'getsentry-test/fixtures/planDetailsLookup';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {CronsBillingBanner} from 'getsentry/components/crons/cronsBillingBanner';
-import {PlanTier} from 'getsentry/types';
 
 describe('CronsBillingBanner', () => {
   beforeEach(() => {

static/gsApp/components/features/insightsDateRangeQueryLimitFooter.spec.tsx

@@ -2,10 +2,10 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import {InsightsDateRangeQueryLimitFooter} from 'getsentry/components/features/insightsDateRangeQueryLimitFooter';
-import {PlanTier} from 'getsentry/types';
 
 describe('InsightsUpsellPage', () => {
   const organization = OrganizationFixture();

static/gsApp/components/features/pageUpsellOverlay.spec.tsx

@@ -2,11 +2,11 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 
 import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import PageUpsellOverlay from 'getsentry/components/features/pageUpsellOverlay';
 import {SubscriptionStore} from 'getsentry/stores/subscriptionStore';
-import {PlanTier} from 'getsentry/types';
 
 describe('PageUpsellOverlay', () => {
   let wrapper: any;

static/gsApp/components/features/planFeature.spec.tsx

@@ -3,11 +3,11 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {BillingConfigFixture} from 'getsentry-test/fixtures/billingConfig';
 import {PlanDetailsLookupFixture} from 'getsentry-test/fixtures/planDetailsLookup';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
+import {PlanTier} from 'getsentry-test/planTier';
 import {render, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import PlanFeature from 'getsentry/components/features/planFeature';
 import {SubscriptionStore} from 'getsentry/stores/subscriptionStore';
-import {PlanTier} from 'getsentry/types';
 
 describe('PlanFeature', () => {
   const organization = OrganizationFixture();