From ab9c7cea57569a262b16975d1bb70c783f05dbc1 Mon Sep 17 00:00:00 2001 From: isabellaenriquez Date: Fri, 10 Oct 2025 17:03:14 -0400 Subject: [PATCH] chore(billing): Clean up checkout file structure --- .../components/upsellModal/featureList.tsx | 2 +- .../billingCycleSelectCard.tsx | 2 +- .../{ => components/cart}/cart.spec.tsx | 2 +- .../amCheckout/{ => components/cart}/cart.tsx | 2 +- .../{ => components/cart}/cartDiff.spec.tsx | 2 +- .../{ => components/cart}/cartDiff.tsx | 0 .../cart}/checkoutOverview.spec.tsx | 2 +- .../cart}/checkoutOverview.tsx | 0 .../cart}/checkoutOverviewV2.spec.tsx | 2 +- .../cart}/checkoutOverviewV2.tsx | 0 .../{ => components}/checkoutOption.tsx | 0 .../{ => components}/checkoutSuccess.spec.tsx | 2 +- .../{ => components}/checkoutSuccess.tsx | 0 .../legacyPlanToggle.spec.tsx | 2 +- .../{ => components}/legacyPlanToggle.tsx | 0 .../{ => components}/moreFeaturesLink.tsx | 0 .../{ => components}/planFeatures.spec.tsx | 2 +- .../{ => components}/planFeatures.tsx | 0 .../reserveAdditionalVolume.spec.tsx | 2 +- .../reserveAdditionalVolume.tsx | 2 +- .../{steps => components}/stepHeader.spec.tsx | 2 +- .../{steps => components}/stepHeader.tsx | 2 +- .../{steps => components}/unitTypeItem.tsx | 0 .../{steps => components}/volumeSliders.tsx | 2 +- static/gsApp/views/amCheckout/index.tsx | 32 +++++++++---------- .../addBillingDetails.spec.tsx | 2 +- .../addBillingDetails.tsx | 2 +- .../addDataVolume.spec.tsx | 2 +- .../{steps => legacySteps}/addDataVolume.tsx | 4 +-- .../addPaymentMethod.spec.tsx | 2 +- .../addPaymentMethod.tsx | 2 +- .../contractSelect.spec.tsx | 0 .../{steps => legacySteps}/contractSelect.tsx | 4 +-- .../onDemandBudgets.spec.tsx | 0 .../onDemandBudgets.tsx | 2 +- .../onDemandSpend.spec.tsx | 2 +- .../{steps => legacySteps}/onDemandSpend.tsx | 2 +- .../planSelect.spec.tsx | 0 .../{steps => legacySteps}/planSelect.tsx | 4 +-- .../{steps => legacySteps}/planSelectCard.tsx | 4 +-- .../{steps => legacySteps}/planSelectRow.tsx | 2 +- .../reviewAndConfirm.spec.tsx | 0 .../reviewAndConfirm.tsx | 2 +- .../setPayAsYouGo.spec.tsx | 0 .../{steps => legacySteps}/setPayAsYouGo.tsx | 2 +- .../{checkoutV3 => }/addBillingInfo.spec.tsx | 0 .../steps/{checkoutV3 => }/addBillingInfo.tsx | 2 +- .../{checkoutV3 => }/buildYourPlan.spec.tsx | 0 .../steps/{checkoutV3 => }/buildYourPlan.tsx | 6 ++-- .../chooseYourBillingCycle.spec.tsx | 0 .../chooseYourBillingCycle.tsx | 4 +-- .../views/amCheckout/steps/productSelect.tsx | 2 +- .../views/amCheckout/steps/setSpendLimit.tsx | 4 +-- .../views/spendLimits/spendLimitSettings.tsx | 4 +-- 54 files changed, 61 insertions(+), 61 deletions(-) rename static/gsApp/views/amCheckout/{ => components}/billingCycleSelectCard.tsx (98%) rename static/gsApp/views/amCheckout/{ => components/cart}/cart.spec.tsx (99%) rename static/gsApp/views/amCheckout/{ => components/cart}/cart.tsx (99%) rename static/gsApp/views/amCheckout/{ => components/cart}/cartDiff.spec.tsx (99%) rename static/gsApp/views/amCheckout/{ => components/cart}/cartDiff.tsx (100%) rename static/gsApp/views/amCheckout/{ => components/cart}/checkoutOverview.spec.tsx (98%) rename static/gsApp/views/amCheckout/{ => components/cart}/checkoutOverview.tsx (100%) rename static/gsApp/views/amCheckout/{ => components/cart}/checkoutOverviewV2.spec.tsx (98%) rename static/gsApp/views/amCheckout/{ => components/cart}/checkoutOverviewV2.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/checkoutOption.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/checkoutSuccess.spec.tsx (96%) rename static/gsApp/views/amCheckout/{ => components}/checkoutSuccess.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/legacyPlanToggle.spec.tsx (98%) rename static/gsApp/views/amCheckout/{ => components}/legacyPlanToggle.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/moreFeaturesLink.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/planFeatures.spec.tsx (96%) rename static/gsApp/views/amCheckout/{ => components}/planFeatures.tsx (100%) rename static/gsApp/views/amCheckout/{ => components}/reserveAdditionalVolume.spec.tsx (99%) rename static/gsApp/views/amCheckout/{ => components}/reserveAdditionalVolume.tsx (98%) rename static/gsApp/views/amCheckout/{steps => components}/stepHeader.spec.tsx (97%) rename static/gsApp/views/amCheckout/{steps => components}/stepHeader.tsx (98%) rename static/gsApp/views/amCheckout/{steps => components}/unitTypeItem.tsx (100%) rename static/gsApp/views/amCheckout/{steps => components}/volumeSliders.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addBillingDetails.spec.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addBillingDetails.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addDataVolume.spec.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addDataVolume.tsx (96%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addPaymentMethod.spec.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/addPaymentMethod.tsx (98%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/contractSelect.spec.tsx (100%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/contractSelect.tsx (97%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/onDemandBudgets.spec.tsx (100%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/onDemandBudgets.tsx (98%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/onDemandSpend.spec.tsx (98%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/onDemandSpend.tsx (98%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/planSelect.spec.tsx (100%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/planSelect.tsx (98%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/planSelectCard.tsx (97%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/planSelectRow.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/reviewAndConfirm.spec.tsx (100%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/reviewAndConfirm.tsx (99%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/setPayAsYouGo.spec.tsx (100%) rename static/gsApp/views/amCheckout/{steps => legacySteps}/setPayAsYouGo.tsx (99%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/addBillingInfo.spec.tsx (100%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/addBillingInfo.tsx (97%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/buildYourPlan.spec.tsx (100%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/buildYourPlan.tsx (96%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/chooseYourBillingCycle.spec.tsx (100%) rename static/gsApp/views/amCheckout/steps/{checkoutV3 => }/chooseYourBillingCycle.tsx (93%) diff --git a/static/gsApp/components/upsellModal/featureList.tsx b/static/gsApp/components/upsellModal/featureList.tsx index b99d160c8e86df..567604512adc94 100644 --- a/static/gsApp/components/upsellModal/featureList.tsx +++ b/static/gsApp/components/upsellModal/featureList.tsx @@ -10,7 +10,7 @@ import {t} from 'sentry/locale'; import {space} from 'sentry/styles/space'; import testableTransition from 'sentry/utils/testableTransition'; -import MoreFeaturesLink from 'getsentry/views/amCheckout/moreFeaturesLink'; +import MoreFeaturesLink from 'getsentry/views/amCheckout/components/moreFeaturesLink'; import type {Feature} from './types'; diff --git a/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx b/static/gsApp/views/amCheckout/components/billingCycleSelectCard.tsx similarity index 98% rename from static/gsApp/views/amCheckout/billingCycleSelectCard.tsx rename to static/gsApp/views/amCheckout/components/billingCycleSelectCard.tsx index 46b11d9c53e2f0..257b5aed90743a 100644 --- a/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx +++ b/static/gsApp/views/amCheckout/components/billingCycleSelectCard.tsx @@ -10,7 +10,7 @@ import {t, tct} from 'sentry/locale'; import {ANNUAL} from 'getsentry/constants'; import type {Plan, Subscription} from 'getsentry/types'; import {displayBudgetName, isDeveloperPlan} from 'getsentry/utils/billing'; -import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption'; +import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption'; import type {CheckoutFormData} from 'getsentry/views/amCheckout/types'; type BillingCycleSelectCardProps = { diff --git a/static/gsApp/views/amCheckout/cart.spec.tsx b/static/gsApp/views/amCheckout/components/cart/cart.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/cart.spec.tsx rename to static/gsApp/views/amCheckout/components/cart/cart.spec.tsx index 000003123f0bf1..13e2495c0e0a5b 100644 --- a/static/gsApp/views/amCheckout/cart.spec.tsx +++ b/static/gsApp/views/amCheckout/components/cart/cart.spec.tsx @@ -25,7 +25,7 @@ import { PlanTier, } from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import Cart from 'getsentry/views/amCheckout/cart'; +import Cart from 'getsentry/views/amCheckout/components/cart/cart'; import {type CheckoutFormData} from 'getsentry/views/amCheckout/types'; // Jun 06 2022 - with milliseconds diff --git a/static/gsApp/views/amCheckout/cart.tsx b/static/gsApp/views/amCheckout/components/cart/cart.tsx similarity index 99% rename from static/gsApp/views/amCheckout/cart.tsx rename to static/gsApp/views/amCheckout/components/cart/cart.tsx index 304151098903a6..cbc06fc0ee1bd6 100644 --- a/static/gsApp/views/amCheckout/cart.tsx +++ b/static/gsApp/views/amCheckout/components/cart/cart.tsx @@ -43,7 +43,7 @@ import { } from 'getsentry/utils/billing'; import {getPlanCategoryName, getSingularCategoryName} from 'getsentry/utils/dataCategory'; import type {State as CheckoutState} from 'getsentry/views/amCheckout/'; -import CartDiff from 'getsentry/views/amCheckout/cartDiff'; +import CartDiff from 'getsentry/views/amCheckout/components/cart/cartDiff'; import type {CheckoutFormData} from 'getsentry/views/amCheckout/types'; import * as utils from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/cartDiff.spec.tsx b/static/gsApp/views/amCheckout/components/cart/cartDiff.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/cartDiff.spec.tsx rename to static/gsApp/views/amCheckout/components/cart/cartDiff.spec.tsx index 84379a16e4bd85..6f596eb4717dd7 100644 --- a/static/gsApp/views/amCheckout/cartDiff.spec.tsx +++ b/static/gsApp/views/amCheckout/components/cart/cartDiff.spec.tsx @@ -10,7 +10,7 @@ import { type Plan, type Subscription, } from 'getsentry/types'; -import CartDiff from 'getsentry/views/amCheckout/cartDiff'; +import CartDiff from 'getsentry/views/amCheckout/components/cart/cartDiff'; import {type CheckoutFormData} from 'getsentry/views/amCheckout/types'; describe('CartDiff', () => { diff --git a/static/gsApp/views/amCheckout/cartDiff.tsx b/static/gsApp/views/amCheckout/components/cart/cartDiff.tsx similarity index 100% rename from static/gsApp/views/amCheckout/cartDiff.tsx rename to static/gsApp/views/amCheckout/components/cart/cartDiff.tsx diff --git a/static/gsApp/views/amCheckout/checkoutOverview.spec.tsx b/static/gsApp/views/amCheckout/components/cart/checkoutOverview.spec.tsx similarity index 98% rename from static/gsApp/views/amCheckout/checkoutOverview.spec.tsx rename to static/gsApp/views/amCheckout/components/cart/checkoutOverview.spec.tsx index ff0dcf76e8808b..8c14146599a0eb 100644 --- a/static/gsApp/views/amCheckout/checkoutOverview.spec.tsx +++ b/static/gsApp/views/amCheckout/components/cart/checkoutOverview.spec.tsx @@ -9,7 +9,7 @@ import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestin import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {AddOnCategory, OnDemandBudgetMode, PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import CheckoutOverview from 'getsentry/views/amCheckout/checkoutOverview'; +import CheckoutOverview from 'getsentry/views/amCheckout/components/cart/checkoutOverview'; import {type CheckoutFormData} from 'getsentry/views/amCheckout/types'; describe('CheckoutOverview', () => { diff --git a/static/gsApp/views/amCheckout/checkoutOverview.tsx b/static/gsApp/views/amCheckout/components/cart/checkoutOverview.tsx similarity index 100% rename from static/gsApp/views/amCheckout/checkoutOverview.tsx rename to static/gsApp/views/amCheckout/components/cart/checkoutOverview.tsx diff --git a/static/gsApp/views/amCheckout/checkoutOverviewV2.spec.tsx b/static/gsApp/views/amCheckout/components/cart/checkoutOverviewV2.spec.tsx similarity index 98% rename from static/gsApp/views/amCheckout/checkoutOverviewV2.spec.tsx rename to static/gsApp/views/amCheckout/components/cart/checkoutOverviewV2.spec.tsx index 652c49f00698d9..9d5246c89de2d6 100644 --- a/static/gsApp/views/amCheckout/checkoutOverviewV2.spec.tsx +++ b/static/gsApp/views/amCheckout/components/cart/checkoutOverviewV2.spec.tsx @@ -7,7 +7,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary'; import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {AddOnCategory, PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import CheckoutOverviewV2 from 'getsentry/views/amCheckout/checkoutOverviewV2'; +import CheckoutOverviewV2 from 'getsentry/views/amCheckout/components/cart/checkoutOverviewV2'; import {type CheckoutFormData} from 'getsentry/views/amCheckout/types'; describe('CheckoutOverviewV2', () => { diff --git a/static/gsApp/views/amCheckout/checkoutOverviewV2.tsx b/static/gsApp/views/amCheckout/components/cart/checkoutOverviewV2.tsx similarity index 100% rename from static/gsApp/views/amCheckout/checkoutOverviewV2.tsx rename to static/gsApp/views/amCheckout/components/cart/checkoutOverviewV2.tsx diff --git a/static/gsApp/views/amCheckout/checkoutOption.tsx b/static/gsApp/views/amCheckout/components/checkoutOption.tsx similarity index 100% rename from static/gsApp/views/amCheckout/checkoutOption.tsx rename to static/gsApp/views/amCheckout/components/checkoutOption.tsx diff --git a/static/gsApp/views/amCheckout/checkoutSuccess.spec.tsx b/static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx similarity index 96% rename from static/gsApp/views/amCheckout/checkoutSuccess.spec.tsx rename to static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx index 93d923950f99f9..b5159ac16233a2 100644 --- a/static/gsApp/views/amCheckout/checkoutSuccess.spec.tsx +++ b/static/gsApp/views/amCheckout/components/checkoutSuccess.spec.tsx @@ -6,7 +6,7 @@ import {render, screen} from 'sentry-test/reactTestingLibrary'; import {resetMockDate, setMockDate} from 'sentry-test/utils'; import {PreviewDataFixture} from 'getsentry/__fixtures__/previewData'; -import CheckoutSuccess from 'getsentry/views/amCheckout/checkoutSuccess'; +import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess'; describe('CheckoutSuccess', () => { const bizPlan = PlanDetailsLookupFixture('am3_business')!; diff --git a/static/gsApp/views/amCheckout/checkoutSuccess.tsx b/static/gsApp/views/amCheckout/components/checkoutSuccess.tsx similarity index 100% rename from static/gsApp/views/amCheckout/checkoutSuccess.tsx rename to static/gsApp/views/amCheckout/components/checkoutSuccess.tsx diff --git a/static/gsApp/views/amCheckout/legacyPlanToggle.spec.tsx b/static/gsApp/views/amCheckout/components/legacyPlanToggle.spec.tsx similarity index 98% rename from static/gsApp/views/amCheckout/legacyPlanToggle.spec.tsx rename to static/gsApp/views/amCheckout/components/legacyPlanToggle.spec.tsx index 88b04ed82e569b..234aac534ca581 100644 --- a/static/gsApp/views/amCheckout/legacyPlanToggle.spec.tsx +++ b/static/gsApp/views/amCheckout/components/legacyPlanToggle.spec.tsx @@ -6,7 +6,7 @@ import {render, screen, waitForElementToBeRemoved} from 'sentry-test/reactTestin import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {CohortId} from 'getsentry/types'; -import LegacyPlanToggle from 'getsentry/views/amCheckout/legacyPlanToggle'; +import LegacyPlanToggle from 'getsentry/views/amCheckout/components/legacyPlanToggle'; describe('LegacyPlanToggle', () => { const organization = OrganizationFixture(); diff --git a/static/gsApp/views/amCheckout/legacyPlanToggle.tsx b/static/gsApp/views/amCheckout/components/legacyPlanToggle.tsx similarity index 100% rename from static/gsApp/views/amCheckout/legacyPlanToggle.tsx rename to static/gsApp/views/amCheckout/components/legacyPlanToggle.tsx diff --git a/static/gsApp/views/amCheckout/moreFeaturesLink.tsx b/static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx similarity index 100% rename from static/gsApp/views/amCheckout/moreFeaturesLink.tsx rename to static/gsApp/views/amCheckout/components/moreFeaturesLink.tsx diff --git a/static/gsApp/views/amCheckout/planFeatures.spec.tsx b/static/gsApp/views/amCheckout/components/planFeatures.spec.tsx similarity index 96% rename from static/gsApp/views/amCheckout/planFeatures.spec.tsx rename to static/gsApp/views/amCheckout/components/planFeatures.spec.tsx index f3209555cad84f..9a68f6be1a7388 100644 --- a/static/gsApp/views/amCheckout/planFeatures.spec.tsx +++ b/static/gsApp/views/amCheckout/components/planFeatures.spec.tsx @@ -1,7 +1,7 @@ import {PlanDetailsLookupFixture} from 'getsentry-test/fixtures/planDetailsLookup'; import {render, screen} from 'sentry-test/reactTestingLibrary'; -import PlanFeatures from 'getsentry/views/amCheckout/planFeatures'; +import PlanFeatures from 'getsentry/views/amCheckout/components/planFeatures'; describe('PlanFeatures', () => { const freePlan = PlanDetailsLookupFixture('am3_f')!; diff --git a/static/gsApp/views/amCheckout/planFeatures.tsx b/static/gsApp/views/amCheckout/components/planFeatures.tsx similarity index 100% rename from static/gsApp/views/amCheckout/planFeatures.tsx rename to static/gsApp/views/amCheckout/components/planFeatures.tsx diff --git a/static/gsApp/views/amCheckout/reserveAdditionalVolume.spec.tsx b/static/gsApp/views/amCheckout/components/reserveAdditionalVolume.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/reserveAdditionalVolume.spec.tsx rename to static/gsApp/views/amCheckout/components/reserveAdditionalVolume.spec.tsx index ea7fdcab3a49a4..c7905ca20c5075 100644 --- a/static/gsApp/views/amCheckout/reserveAdditionalVolume.spec.tsx +++ b/static/gsApp/views/amCheckout/components/reserveAdditionalVolume.spec.tsx @@ -9,7 +9,7 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary'; import {MONTHLY} from 'getsentry/constants'; import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {PlanTier} from 'getsentry/types'; -import ReserveAdditionalVolume from 'getsentry/views/amCheckout/reserveAdditionalVolume'; +import ReserveAdditionalVolume from 'getsentry/views/amCheckout/components/reserveAdditionalVolume'; type SliderInfo = { billingInterval: string; diff --git a/static/gsApp/views/amCheckout/reserveAdditionalVolume.tsx b/static/gsApp/views/amCheckout/components/reserveAdditionalVolume.tsx similarity index 98% rename from static/gsApp/views/amCheckout/reserveAdditionalVolume.tsx rename to static/gsApp/views/amCheckout/components/reserveAdditionalVolume.tsx index 8b1d65277b9a44..7a9224b2f38974 100644 --- a/static/gsApp/views/amCheckout/reserveAdditionalVolume.tsx +++ b/static/gsApp/views/amCheckout/components/reserveAdditionalVolume.tsx @@ -13,7 +13,7 @@ import type {DataCategory} from 'sentry/types/core'; import {PlanTier} from 'getsentry/types'; import {isAmPlan} from 'getsentry/utils/billing'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; -import VolumeSliders from 'getsentry/views/amCheckout/steps/volumeSliders'; +import VolumeSliders from 'getsentry/views/amCheckout/components/volumeSliders'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import {formatPrice, getShortInterval} from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/stepHeader.spec.tsx b/static/gsApp/views/amCheckout/components/stepHeader.spec.tsx similarity index 97% rename from static/gsApp/views/amCheckout/steps/stepHeader.spec.tsx rename to static/gsApp/views/amCheckout/components/stepHeader.spec.tsx index 23cb9202c49d5d..af31c2276c13ec 100644 --- a/static/gsApp/views/amCheckout/steps/stepHeader.spec.tsx +++ b/static/gsApp/views/amCheckout/components/stepHeader.spec.tsx @@ -1,6 +1,6 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; describe('StepHeader', () => { let onEdit: any; diff --git a/static/gsApp/views/amCheckout/steps/stepHeader.tsx b/static/gsApp/views/amCheckout/components/stepHeader.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/stepHeader.tsx rename to static/gsApp/views/amCheckout/components/stepHeader.tsx index 589bf4f8b3fe1a..0cb0d3f5604c03 100644 --- a/static/gsApp/views/amCheckout/steps/stepHeader.tsx +++ b/static/gsApp/views/amCheckout/components/stepHeader.tsx @@ -9,7 +9,7 @@ import {space} from 'sentry/styles/space'; import type {Organization} from 'sentry/types/organization'; import type {PlanTier} from 'getsentry/types'; -import LegacyPlanToggle from 'getsentry/views/amCheckout/legacyPlanToggle'; +import LegacyPlanToggle from 'getsentry/views/amCheckout/components/legacyPlanToggle'; import {getToggleTier} from 'getsentry/views/amCheckout/utils'; // TODO(checkout v3): Remove isActive/isCompleted/onEdit/canSkip diff --git a/static/gsApp/views/amCheckout/steps/unitTypeItem.tsx b/static/gsApp/views/amCheckout/components/unitTypeItem.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/unitTypeItem.tsx rename to static/gsApp/views/amCheckout/components/unitTypeItem.tsx diff --git a/static/gsApp/views/amCheckout/steps/volumeSliders.tsx b/static/gsApp/views/amCheckout/components/volumeSliders.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/volumeSliders.tsx rename to static/gsApp/views/amCheckout/components/volumeSliders.tsx index 5815aa8fb44751..c1ca6dcf63de36 100644 --- a/static/gsApp/views/amCheckout/steps/volumeSliders.tsx +++ b/static/gsApp/views/amCheckout/components/volumeSliders.tsx @@ -22,7 +22,7 @@ import { isByteCategory, } from 'getsentry/utils/dataCategory'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; -import UnitTypeItem from 'getsentry/views/amCheckout/steps/unitTypeItem'; +import UnitTypeItem from 'getsentry/views/amCheckout/components/unitTypeItem'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import * as utils from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/index.tsx b/static/gsApp/views/amCheckout/index.tsx index 2e03be21642061..0244b1ba4e5a1f 100644 --- a/static/gsApp/views/amCheckout/index.tsx +++ b/static/gsApp/views/amCheckout/index.tsx @@ -72,22 +72,22 @@ import {getCompletedOrActivePromotion} from 'getsentry/utils/promotions'; import {showSubscriptionDiscount} from 'getsentry/utils/promotionUtils'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; import withPromotions from 'getsentry/utils/withPromotions'; -import Cart from 'getsentry/views/amCheckout/cart'; -import CheckoutOverview from 'getsentry/views/amCheckout/checkoutOverview'; -import CheckoutOverviewV2 from 'getsentry/views/amCheckout/checkoutOverviewV2'; -import CheckoutSuccess from 'getsentry/views/amCheckout/checkoutSuccess'; -import AddBillingDetails from 'getsentry/views/amCheckout/steps/addBillingDetails'; -import AddDataVolume from 'getsentry/views/amCheckout/steps/addDataVolume'; -import AddPaymentMethod from 'getsentry/views/amCheckout/steps/addPaymentMethod'; -import AddBillingInformation from 'getsentry/views/amCheckout/steps/checkoutV3/addBillingInfo'; -import BuildYourPlan from 'getsentry/views/amCheckout/steps/checkoutV3/buildYourPlan'; -import ChooseYourBillingCycle from 'getsentry/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle'; -import ContractSelect from 'getsentry/views/amCheckout/steps/contractSelect'; -import OnDemandBudgetsStep from 'getsentry/views/amCheckout/steps/onDemandBudgets'; -import OnDemandSpend from 'getsentry/views/amCheckout/steps/onDemandSpend'; -import PlanSelect from 'getsentry/views/amCheckout/steps/planSelect'; -import ReviewAndConfirm from 'getsentry/views/amCheckout/steps/reviewAndConfirm'; -import SetPayAsYouGo from 'getsentry/views/amCheckout/steps/setPayAsYouGo'; +import Cart from 'getsentry/views/amCheckout/components/cart/cart'; +import CheckoutOverview from 'getsentry/views/amCheckout/components/cart/checkoutOverview'; +import CheckoutOverviewV2 from 'getsentry/views/amCheckout/components/cart/checkoutOverviewV2'; +import CheckoutSuccess from 'getsentry/views/amCheckout/components/checkoutSuccess'; +import AddBillingDetails from 'getsentry/views/amCheckout/legacySteps/addBillingDetails'; +import AddDataVolume from 'getsentry/views/amCheckout/legacySteps/addDataVolume'; +import AddPaymentMethod from 'getsentry/views/amCheckout/legacySteps/addPaymentMethod'; +import ContractSelect from 'getsentry/views/amCheckout/legacySteps/contractSelect'; +import OnDemandBudgetsStep from 'getsentry/views/amCheckout/legacySteps/onDemandBudgets'; +import OnDemandSpend from 'getsentry/views/amCheckout/legacySteps/onDemandSpend'; +import PlanSelect from 'getsentry/views/amCheckout/legacySteps/planSelect'; +import ReviewAndConfirm from 'getsentry/views/amCheckout/legacySteps/reviewAndConfirm'; +import SetPayAsYouGo from 'getsentry/views/amCheckout/legacySteps/setPayAsYouGo'; +import AddBillingInformation from 'getsentry/views/amCheckout/steps/addBillingInfo'; +import BuildYourPlan from 'getsentry/views/amCheckout/steps/buildYourPlan'; +import ChooseYourBillingCycle from 'getsentry/views/amCheckout/steps/chooseYourBillingCycle'; import SetSpendLimit from 'getsentry/views/amCheckout/steps/setSpendLimit'; import type {CheckoutFormData} from 'getsentry/views/amCheckout/types'; import {getBucket} from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/addBillingDetails.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/addBillingDetails.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/addBillingDetails.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/addBillingDetails.spec.tsx index 917c0c4923141d..dce7e49bad9873 100644 --- a/static/gsApp/views/amCheckout/steps/addBillingDetails.spec.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addBillingDetails.spec.tsx @@ -8,7 +8,7 @@ import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary'; import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {AddressType, PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import AddBillingDetails from 'getsentry/views/amCheckout/steps/addBillingDetails'; +import AddBillingDetails from 'getsentry/views/amCheckout/legacySteps/addBillingDetails'; import type {StepProps} from 'getsentry/views/amCheckout/types'; // Stripe mocks handled by global setup.ts diff --git a/static/gsApp/views/amCheckout/steps/addBillingDetails.tsx b/static/gsApp/views/amCheckout/legacySteps/addBillingDetails.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/addBillingDetails.tsx rename to static/gsApp/views/amCheckout/legacySteps/addBillingDetails.tsx index 3f2bc76b05d181..60cc98a9ead9f9 100644 --- a/static/gsApp/views/amCheckout/steps/addBillingDetails.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addBillingDetails.tsx @@ -21,7 +21,7 @@ import type {BillingDetails} from 'getsentry/types'; import {AddressType} from 'getsentry/types'; import {getCountryByCode} from 'getsentry/utils/ISO3166codes'; import {getRegionChoiceName, getTaxFieldInfo} from 'getsentry/utils/salesTax'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; type State = { diff --git a/static/gsApp/views/amCheckout/steps/addDataVolume.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/addDataVolume.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/addDataVolume.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/addDataVolume.spec.tsx index d8f5a7da360916..25b299eef69251 100644 --- a/static/gsApp/views/amCheckout/steps/addDataVolume.spec.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addDataVolume.spec.tsx @@ -10,7 +10,7 @@ import {ANNUAL, MONTHLY} from 'getsentry/constants'; import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import AddDataVolume from 'getsentry/views/amCheckout/steps/addDataVolume'; +import AddDataVolume from 'getsentry/views/amCheckout/legacySteps/addDataVolume'; type SliderInfo = { billingInterval: string; diff --git a/static/gsApp/views/amCheckout/steps/addDataVolume.tsx b/static/gsApp/views/amCheckout/legacySteps/addDataVolume.tsx similarity index 96% rename from static/gsApp/views/amCheckout/steps/addDataVolume.tsx rename to static/gsApp/views/amCheckout/legacySteps/addDataVolume.tsx index e3e2dcfe55142e..9d97ae5d158b49 100644 --- a/static/gsApp/views/amCheckout/steps/addDataVolume.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addDataVolume.tsx @@ -13,8 +13,8 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock'; import {PlanTier} from 'getsentry/types'; import {isAmPlan} from 'getsentry/utils/billing'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; -import VolumeSliders from 'getsentry/views/amCheckout/steps/volumeSliders'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; +import VolumeSliders from 'getsentry/views/amCheckout/components/volumeSliders'; import type {StepProps} from 'getsentry/views/amCheckout/types'; function AddDataVolume({ diff --git a/static/gsApp/views/amCheckout/steps/addPaymentMethod.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.spec.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/addPaymentMethod.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.spec.tsx index 1b1ea187e53293..a6d4e223996245 100644 --- a/static/gsApp/views/amCheckout/steps/addPaymentMethod.spec.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.spec.tsx @@ -13,7 +13,7 @@ import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import type {Subscription as SubscriptionType} from 'getsentry/types'; import {FTCConsentLocation, PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout/'; -import AddPaymentMethod from 'getsentry/views/amCheckout/steps/addPaymentMethod'; +import AddPaymentMethod from 'getsentry/views/amCheckout/legacySteps/addPaymentMethod'; import type {StepProps} from 'getsentry/views/amCheckout/types'; // Stripe mocks handled by global setup.ts diff --git a/static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx b/static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx rename to static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.tsx index f4a943efb96fd0..9c074eb0918d8f 100644 --- a/static/gsApp/views/amCheckout/steps/addPaymentMethod.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/addPaymentMethod.tsx @@ -16,7 +16,7 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock'; import CreditCardSetup from 'getsentry/components/creditCardEdit/setup'; import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {FTCConsentLocation} from 'getsentry/types'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; type Props = StepProps; diff --git a/static/gsApp/views/amCheckout/steps/contractSelect.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/contractSelect.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/contractSelect.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/contractSelect.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/contractSelect.tsx b/static/gsApp/views/amCheckout/legacySteps/contractSelect.tsx similarity index 97% rename from static/gsApp/views/amCheckout/steps/contractSelect.tsx rename to static/gsApp/views/amCheckout/legacySteps/contractSelect.tsx index 81221b432e97c5..8fb0c46a406e30 100644 --- a/static/gsApp/views/amCheckout/steps/contractSelect.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/contractSelect.tsx @@ -11,8 +11,8 @@ import {space} from 'sentry/styles/space'; import {ANNUAL, MONTHLY} from 'getsentry/constants'; import type {Plan} from 'getsentry/types'; -import PlanSelectRow from 'getsentry/views/amCheckout/steps/planSelectRow'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; +import PlanSelectRow from 'getsentry/views/amCheckout/legacySteps/planSelectRow'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import {formatPrice, getReservedPriceCents} from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/onDemandBudgets.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/onDemandBudgets.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx b/static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx rename to static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.tsx index 90b0e5fc842066..89edcdc283f669 100644 --- a/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/onDemandBudgets.tsx @@ -11,7 +11,7 @@ import {space} from 'sentry/styles/space'; import type {OnDemandBudgets} from 'getsentry/types'; import {OnDemandBudgetMode} from 'getsentry/types'; import {isDeveloperPlan} from 'getsentry/utils/billing'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import {getReservedPriceCents} from 'getsentry/views/amCheckout/utils'; import OnDemandBudgetEdit from 'getsentry/views/onDemandBudgets/onDemandBudgetEdit'; diff --git a/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/onDemandSpend.spec.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/onDemandSpend.spec.tsx index e659f61448c081..1e9c2a45dfcec1 100644 --- a/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/onDemandSpend.spec.tsx @@ -9,7 +9,7 @@ import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary import SubscriptionStore from 'getsentry/stores/subscriptionStore'; import {PlanTier} from 'getsentry/types'; import AMCheckout from 'getsentry/views/amCheckout'; -import OnDemandSpend from 'getsentry/views/amCheckout/steps/onDemandSpend'; +import OnDemandSpend from 'getsentry/views/amCheckout/legacySteps/onDemandSpend'; import type {StepProps} from 'getsentry/views/amCheckout/types'; describe('OnDemandSpend', () => { diff --git a/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx b/static/gsApp/views/amCheckout/legacySteps/onDemandSpend.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/onDemandSpend.tsx rename to static/gsApp/views/amCheckout/legacySteps/onDemandSpend.tsx index c986f53e286c00..cb2b1e57c1a067 100644 --- a/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/onDemandSpend.tsx @@ -12,7 +12,7 @@ import {space} from 'sentry/styles/space'; import TextBlock from 'sentry/views/settings/components/text/textBlock'; import {listDisplayNames} from 'getsentry/utils/dataCategory'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; type Props = StepProps; diff --git a/static/gsApp/views/amCheckout/steps/planSelect.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/planSelect.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/planSelect.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/planSelect.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/planSelect.tsx b/static/gsApp/views/amCheckout/legacySteps/planSelect.tsx similarity index 98% rename from static/gsApp/views/amCheckout/steps/planSelect.tsx rename to static/gsApp/views/amCheckout/legacySteps/planSelect.tsx index 6360e52efc99a0..de6796577cdd4e 100644 --- a/static/gsApp/views/amCheckout/steps/planSelect.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/planSelect.tsx @@ -27,9 +27,9 @@ import { } from 'getsentry/utils/promotionUtils'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; import usePromotionTriggerCheck from 'getsentry/utils/usePromotionTriggerCheck'; -import PlanSelectRow from 'getsentry/views/amCheckout/steps/planSelectRow'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; +import PlanSelectRow from 'getsentry/views/amCheckout/legacySteps/planSelectRow'; import ProductSelect from 'getsentry/views/amCheckout/steps/productSelect'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; import type {PlanContent, StepProps} from 'getsentry/views/amCheckout/types'; import { formatPrice, diff --git a/static/gsApp/views/amCheckout/steps/planSelectCard.tsx b/static/gsApp/views/amCheckout/legacySteps/planSelectCard.tsx similarity index 97% rename from static/gsApp/views/amCheckout/steps/planSelectCard.tsx rename to static/gsApp/views/amCheckout/legacySteps/planSelectCard.tsx index e87691f1788fd5..3d308a8c54f7ee 100644 --- a/static/gsApp/views/amCheckout/steps/planSelectCard.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/planSelectCard.tsx @@ -8,8 +8,8 @@ import type {SVGIconProps} from 'sentry/icons/svgIcon'; import {PAYG_BUSINESS_DEFAULT, PAYG_TEAM_DEFAULT} from 'getsentry/constants'; import {OnDemandBudgetMode} from 'getsentry/types'; import {isBizPlanFamily} from 'getsentry/utils/billing'; -import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption'; -import type {PlanSelectRowProps} from 'getsentry/views/amCheckout/steps/planSelectRow'; +import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption'; +import type {PlanSelectRowProps} from 'getsentry/views/amCheckout/legacySteps/planSelectRow'; import type {CheckoutFormData} from 'getsentry/views/amCheckout/types'; import {getShortInterval} from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/planSelectRow.tsx b/static/gsApp/views/amCheckout/legacySteps/planSelectRow.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/planSelectRow.tsx rename to static/gsApp/views/amCheckout/legacySteps/planSelectRow.tsx index 03e2d1b882dcbb..b55fbd45d1c60e 100644 --- a/static/gsApp/views/amCheckout/steps/planSelectRow.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/planSelectRow.tsx @@ -13,7 +13,7 @@ import TextBlock from 'sentry/views/settings/components/text/textBlock'; import {PAYG_BUSINESS_DEFAULT, PAYG_TEAM_DEFAULT} from 'getsentry/constants'; import {OnDemandBudgetMode, type Plan, type Promotion} from 'getsentry/types'; import {isBizPlanFamily} from 'getsentry/utils/billing'; -import MoreFeaturesLink from 'getsentry/views/amCheckout/moreFeaturesLink'; +import MoreFeaturesLink from 'getsentry/views/amCheckout/components/moreFeaturesLink'; import type {CheckoutFormData, PlanContent} from 'getsentry/views/amCheckout/types'; import { displayUnitPrice, diff --git a/static/gsApp/views/amCheckout/steps/reviewAndConfirm.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/reviewAndConfirm.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/reviewAndConfirm.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/reviewAndConfirm.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx b/static/gsApp/views/amCheckout/legacySteps/reviewAndConfirm.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx rename to static/gsApp/views/amCheckout/legacySteps/reviewAndConfirm.tsx index 730d21af730fde..ff24e219f723e4 100644 --- a/static/gsApp/views/amCheckout/steps/reviewAndConfirm.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/reviewAndConfirm.tsx @@ -19,7 +19,7 @@ import {useStripeInstance} from 'getsentry/hooks/useStripeInstance'; import type {PreviewData, Subscription} from 'getsentry/types'; import {InvoiceItemType} from 'getsentry/types'; import {hasPartnerMigrationFeature} from 'getsentry/utils/billing'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepPropsWithApi} from 'getsentry/views/amCheckout/types'; import type {IntentDetails} from 'getsentry/views/amCheckout/utils'; import { diff --git a/static/gsApp/views/amCheckout/steps/setPayAsYouGo.spec.tsx b/static/gsApp/views/amCheckout/legacySteps/setPayAsYouGo.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/setPayAsYouGo.spec.tsx rename to static/gsApp/views/amCheckout/legacySteps/setPayAsYouGo.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx b/static/gsApp/views/amCheckout/legacySteps/setPayAsYouGo.tsx similarity index 99% rename from static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx rename to static/gsApp/views/amCheckout/legacySteps/setPayAsYouGo.tsx index b7ad379e3c0466..7606a6eeb43b7e 100644 --- a/static/gsApp/views/amCheckout/steps/setPayAsYouGo.tsx +++ b/static/gsApp/views/amCheckout/legacySteps/setPayAsYouGo.tsx @@ -21,7 +21,7 @@ import {OnDemandBudgetMode, type OnDemandBudgets} from 'getsentry/types'; import {isBizPlanFamily} from 'getsentry/utils/billing'; import {getPlanCategoryName} from 'getsentry/utils/dataCategory'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import {getTotalBudget} from 'getsentry/views/onDemandBudgets/utils'; diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.spec.tsx b/static/gsApp/views/amCheckout/steps/addBillingInfo.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.spec.tsx rename to static/gsApp/views/amCheckout/steps/addBillingInfo.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.tsx b/static/gsApp/views/amCheckout/steps/addBillingInfo.tsx similarity index 97% rename from static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.tsx rename to static/gsApp/views/amCheckout/steps/addBillingInfo.tsx index 864cc9776aa9d9..7e6666a9cc5fd8 100644 --- a/static/gsApp/views/amCheckout/steps/checkoutV3/addBillingInfo.tsx +++ b/static/gsApp/views/amCheckout/steps/addBillingInfo.tsx @@ -10,7 +10,7 @@ import BillingDetailsPanel from 'getsentry/components/billingDetails/panel'; import CreditCardPanel from 'getsentry/components/creditCardEdit/panel'; import {useBillingDetails} from 'getsentry/hooks/useBillingDetails'; import {FTCConsentLocation} from 'getsentry/types'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {CheckoutV3StepProps} from 'getsentry/views/amCheckout/types'; import {hasBillingInfo} from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.spec.tsx b/static/gsApp/views/amCheckout/steps/buildYourPlan.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.spec.tsx rename to static/gsApp/views/amCheckout/steps/buildYourPlan.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.tsx b/static/gsApp/views/amCheckout/steps/buildYourPlan.tsx similarity index 96% rename from static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.tsx rename to static/gsApp/views/amCheckout/steps/buildYourPlan.tsx index 8fb02aa5707beb..7d33a77a16cf71 100644 --- a/static/gsApp/views/amCheckout/steps/checkoutV3/buildYourPlan.tsx +++ b/static/gsApp/views/amCheckout/steps/buildYourPlan.tsx @@ -16,10 +16,10 @@ import { isNewPayingCustomer, isTrialPlan, } from 'getsentry/utils/billing'; -import PlanFeatures from 'getsentry/views/amCheckout/planFeatures'; -import PlanSelectCard from 'getsentry/views/amCheckout/steps/planSelectCard'; +import PlanFeatures from 'getsentry/views/amCheckout/components/planFeatures'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; +import PlanSelectCard from 'getsentry/views/amCheckout/legacySteps/planSelectCard'; import ProductSelect from 'getsentry/views/amCheckout/steps/productSelect'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; import type { CheckoutFormData, CheckoutV3StepProps, diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle.spec.tsx b/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.spec.tsx similarity index 100% rename from static/gsApp/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle.spec.tsx rename to static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.spec.tsx diff --git a/static/gsApp/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle.tsx b/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.tsx similarity index 93% rename from static/gsApp/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle.tsx rename to static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.tsx index ce2089bee47a18..94d77ba897fc0a 100644 --- a/static/gsApp/views/amCheckout/steps/checkoutV3/chooseYourBillingCycle.tsx +++ b/static/gsApp/views/amCheckout/steps/chooseYourBillingCycle.tsx @@ -4,8 +4,8 @@ import {Flex, Grid} from 'sentry/components/core/layout'; import {t} from 'sentry/locale'; import {ANNUAL} from 'getsentry/constants'; -import BillingCycleSelectCard from 'getsentry/views/amCheckout/billingCycleSelectCard'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import BillingCycleSelectCard from 'getsentry/views/amCheckout/components/billingCycleSelectCard'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {CheckoutV3StepProps} from 'getsentry/views/amCheckout/types'; import * as utils from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/productSelect.tsx b/static/gsApp/views/amCheckout/steps/productSelect.tsx index b89d136dfa807f..0137ae75f50364 100644 --- a/static/gsApp/views/amCheckout/steps/productSelect.tsx +++ b/static/gsApp/views/amCheckout/steps/productSelect.tsx @@ -31,7 +31,7 @@ import { getSingularCategoryName, } from 'getsentry/utils/dataCategory'; import formatCurrency from 'getsentry/utils/formatCurrency'; -import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption'; +import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption'; import {type StepProps} from 'getsentry/views/amCheckout/types'; import * as utils from 'getsentry/views/amCheckout/utils'; diff --git a/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx b/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx index e2c912c5db249b..bd377cc9d995e0 100644 --- a/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx +++ b/static/gsApp/views/amCheckout/steps/setSpendLimit.tsx @@ -6,8 +6,8 @@ import {t} from 'sentry/locale'; import type {OnDemandBudgets} from 'getsentry/types'; import {displayBudgetName} from 'getsentry/utils/billing'; import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics'; -import ReserveAdditionalVolume from 'getsentry/views/amCheckout/reserveAdditionalVolume'; -import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader'; +import ReserveAdditionalVolume from 'getsentry/views/amCheckout/components/reserveAdditionalVolume'; +import StepHeader from 'getsentry/views/amCheckout/components/stepHeader'; import type {StepProps} from 'getsentry/views/amCheckout/types'; import { getTotalBudget, diff --git a/static/gsApp/views/spendLimits/spendLimitSettings.tsx b/static/gsApp/views/spendLimits/spendLimitSettings.tsx index 6cf2c95c168d4b..2b5ad4d14a78f9 100644 --- a/static/gsApp/views/spendLimits/spendLimitSettings.tsx +++ b/static/gsApp/views/spendLimits/spendLimitSettings.tsx @@ -33,9 +33,9 @@ import { getPlanCategoryName, getSingularCategoryName, } from 'getsentry/utils/dataCategory'; -import CheckoutOption from 'getsentry/views/amCheckout/checkoutOption'; +import CheckoutOption from 'getsentry/views/amCheckout/components/checkoutOption'; +import {renderPerformanceHovercard} from 'getsentry/views/amCheckout/components/volumeSliders'; import {getProductCheckoutDescription} from 'getsentry/views/amCheckout/steps/productSelect'; -import {renderPerformanceHovercard} from 'getsentry/views/amCheckout/steps/volumeSliders'; import { displayPrice, displayPriceWithCents,