Skip to content

Commit 9cbcacb

Browse files
chore: Replace account details plan data occurrences (#3587)
Co-authored-by: RulaKhaled <[email protected]>
1 parent 5dfae65 commit 9cbcacb

File tree

12 files changed

+164
-70
lines changed

12 files changed

+164
-70
lines changed

src/pages/MembersPage/MembersActivation/Activation/Activation.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function Activation() {
1616
})
1717

1818
const activatedUserCount = accountDetails?.activatedUserCount || 0
19-
const planQuantity = accountDetails?.plan?.quantity || 0
19+
const planQuantity = planData?.plan?.planUserCount || 0
2020

2121
if (
2222
isTrialPlan(planData?.plan?.value) &&

src/pages/MembersPage/MembersActivation/Activation/Activation.test.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const mockPlanData = {
3939
trialEndDate: '',
4040
trialTotalDays: 0,
4141
pretrialUsersCount: 0,
42-
planUserCount: 1,
42+
planUserCount: 9,
4343
hasSeatsLeft: true,
4444
}
4545

src/pages/PlanPage/subRoutes/CancelPlanPage/subRoutes/DowngradePlan/DowngradePlan.test.jsx

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { setupServer } from 'msw/node'
55
import { Suspense } from 'react'
66
import { MemoryRouter, Route } from 'react-router-dom'
77

8+
import { TrialStatuses } from 'services/account'
89
import { Plans } from 'shared/utils/billing'
910

1011
import DowngradePlan from './DowngradePlan'
@@ -24,6 +25,28 @@ const mockAccountDetails = {
2425
},
2526
}
2627

28+
const mockPlanData = {
29+
owner: {
30+
hasPrivateRepos: true,
31+
plan: {
32+
isEnterprisePlan: false,
33+
baseUnitPrice: 10,
34+
benefits: [],
35+
billingRate: 'monthly',
36+
marketingName: 'Users Basic',
37+
monthlyUploadLimit: 250,
38+
value: Plans.USERS_BASIC,
39+
trialStatus: TrialStatuses.NOT_STARTED,
40+
trialStartDate: '',
41+
trialEndDate: '',
42+
trialTotalDays: 0,
43+
pretrialUsersCount: 0,
44+
planUserCount: 5,
45+
hasSeatsLeft: false,
46+
},
47+
},
48+
}
49+
2750
const queryClient = new QueryClient({
2851
defaultOptions: { queries: { suspense: true } },
2952
})
@@ -59,9 +82,7 @@ describe('DowngradePlan', () => {
5982
return HttpResponse.json(mockAccountDetails)
6083
}),
6184
graphql.query('GetPlanData', () => {
62-
return HttpResponse.json({
63-
data: { plan: { isFreePlan: true } },
64-
})
85+
return HttpResponse.json(mockPlanData)
6586
})
6687
)
6788
}

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/ProPlanDetails/ProPlanDetails.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function ProPlanDetails() {
1919
const { data: plans } = useAvailablePlans({ provider, owner })
2020
const { proPlanMonth, proPlanYear } = findProPlans({ plans })
2121

22-
const plan = accountDetails?.rootOrganization?.plan ?? accountDetails?.plan
2322
const scheduledPhase = accountDetails?.scheduleDetail?.scheduledPhase
2423

2524
const cancelAtPeriodEnd =
@@ -55,9 +54,9 @@ function ProPlanDetails() {
5554
)}
5655
{shouldRenderCancelLink({
5756
cancelAtPeriodEnd,
58-
plan,
5957
trialStatus,
6058
isFreePlan: planData?.plan?.isFreePlan,
59+
plan: planData?.plan,
6160
}) && (
6261
<A
6362
to={{ pageName: 'cancelOrgPlan' }}

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/SentryPlanDetails/SentryPlanDetails.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ function SentryPlanDetails() {
1818
const { data: plans } = useAvailablePlans({ provider, owner })
1919
const { sentryPlanYear } = findSentryPlans({ plans })
2020

21-
const plan = accountDetails?.rootOrganization?.plan ?? accountDetails?.plan
2221
const cancelAtPeriodEnd =
2322
accountDetails?.subscriptionDetail?.cancelAtPeriodEnd
2423
const trialStatus = planData?.plan?.trialStatus
25-
2624
return (
2725
<div className="h-fit border md:w-[280px]">
2826
<h3 className="p-4 font-semibold">
@@ -52,9 +50,8 @@ function SentryPlanDetails() {
5250
is a bug imo and needs to be here in a future ticket */}
5351
{shouldRenderCancelLink({
5452
cancelAtPeriodEnd,
55-
plan,
53+
plan: planData?.plan,
5654
trialStatus,
57-
isFreePlan: planData?.plan?.isFreePlan,
5855
}) && (
5956
<A
6057
to={{ pageName: 'cancelOrgPlan' }}

src/pages/PlanPage/subRoutes/UpgradePlanPage/UpgradeDetails/TeamPlanDetails/TeamPlanDetails.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function TeamPlanDetails() {
1919
const { data: plans } = useAvailablePlans({ provider, owner })
2020
const { teamPlanYear, teamPlanMonth } = findTeamPlans({ plans })
2121

22-
const plan = accountDetails?.rootOrganization?.plan ?? accountDetails?.plan
2322
const scheduledPhase = accountDetails?.scheduleDetail?.scheduledPhase
2423

2524
const cancelAtPeriodEnd =
@@ -55,9 +54,8 @@ function TeamPlanDetails() {
5554
)}
5655
{shouldRenderCancelLink({
5756
cancelAtPeriodEnd,
58-
plan,
57+
plan: planData?.plan,
5958
trialStatus,
60-
isFreePlan: planData?.plan?.isFreePlan,
6159
}) && (
6260
<A
6361
to={{ pageName: 'cancelOrgPlan' }}

0 commit comments

Comments
 (0)