Skip to content

Commit 97cc92a

Browse files
feat: Add messaging for free seats and clarify paid (#3925)
1 parent 8816d1e commit 97cc92a

File tree

65 files changed

+761
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+761
-103
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"@types/js-cookie": "3.0.6",
124124
"@types/lodash": "4.17.6",
125125
"@types/node": "^22.9.0",
126+
"@types/pluralize": "^0.0.33",
126127
"@types/prismjs": "^1.26.4",
127128
"@types/prop-types": "15.7.12",
128129
"@types/qs": "6.9.15",

src/pages/AccountSettings/AccountSettings.test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const mockPlanData = {
3838
trialTotalDays: 0,
3939
pretrialUsersCount: 0,
4040
planUserCount: 1,
41+
freeSeatCount: 0,
4142
hasSeatsLeft: true,
4243
}
4344

src/pages/AccountSettings/AccountSettingsSideMenu.test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const mockPlanData = {
2626
trialTotalDays: 0,
2727
pretrialUsersCount: 0,
2828
planUserCount: 1,
29+
freeSeatCount: 0,
2930
hasSeatsLeft: true,
3031
}
3132

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import pluralize from 'pluralize'
12
import { useParams } from 'react-router-dom'
23

34
import { useAccountDetails } from 'services/account/useAccountDetails'
@@ -74,6 +75,9 @@ function Activation() {
7475
activated members of{' '}
7576
<span className="text-lg font-semibold">{planQuantity}</span> available
7677
seats{' '}
78+
{planData?.plan?.freeSeatCount
79+
? `(${planData?.plan?.freeSeatCount} free ${pluralize('seat', planData?.plan?.freeSeatCount)} included) `
80+
: ''}
7781
{accountDetails && (
7882
<ChangePlanLink
7983
accountDetails={accountDetails}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const mockPlanData = {
4444
trialTotalDays: 0,
4545
pretrialUsersCount: 0,
4646
planUserCount: 9,
47+
freeSeatCount: 2,
4748
hasSeatsLeft: true,
4849
}
4950

@@ -140,6 +141,15 @@ describe('Activation', () => {
140141
expect(availableSeats).toBeInTheDocument()
141142
})
142143

144+
it('displays number of plan free seats', async () => {
145+
setup()
146+
147+
render(<Activation />, { wrapper: wrapper() })
148+
149+
const freeSeats = await screen.findByText(/2 free seats included/)
150+
expect(freeSeats).toBeInTheDocument()
151+
})
152+
143153
it('displays change plan link', async () => {
144154
setup()
145155

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const mockPlanData = {
3939
trialTotalDays: 0,
4040
pretrialUsersCount: 0,
4141
planUserCount: 1,
42+
freeSeatCount: 1,
4243
hasSeatsLeft: true,
4344
isEnterprisePlan: false,
4445
isFreePlan: false,

src/pages/MembersPage/MembersList/MembersTable/MembersTable.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ const mockPlanData = {
126126
trialEndDate: '',
127127
trialTotalDays: 0,
128128
pretrialUsersCount: 0,
129+
freeSeatCount: 0,
129130
}
130131

131132
const server = setupServer()

src/pages/OwnerPage/HeaderBanners/ExceededUploadsAlert/ExceededUploadsAlert.test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const mockPlanDataResponse = {
3636
trialTotalDays: 0,
3737
pretrialUsersCount: 0,
3838
planUserCount: 1,
39+
freeSeatCount: 0,
3940
hasSeatsLeft: true,
4041
isEnterprisePlan: false,
4142
isFreePlan: false,

src/pages/OwnerPage/HeaderBanners/HeaderBanners.test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const mockPlanDataResponse = {
3939
trialTotalDays: 0,
4040
pretrialUsersCount: 0,
4141
planUserCount: 1,
42+
freeSeatCount: 0,
4243
hasSeatsLeft: true,
4344
isEnterprisePlan: false,
4445
isFreePlan: false,

src/pages/OwnerPage/HeaderBanners/ReachingUploadLimitAlert/ReachingUploadLimitAlert.test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const mockPlanDataResponse = {
4242
trialTotalDays: 0,
4343
pretrialUsersCount: 0,
4444
planUserCount: 1,
45+
freeSeatCount: 0,
4546
hasSeatsLeft: true,
4647
}
4748

0 commit comments

Comments
 (0)