feat: Free trial mutations (#9132)

* feat(trials): Start Trial mutation * GQL + FE updates * Copy update * Minor fixes * End Trial mutation * Some cleanup * More fixes * Rename var * Extract 'getFeatureTier' * More cleanup * Tiny cleanup * CR: change to featureTier and billingTier * CR: Misc fixes * Rename featureTier back to just tier * CR: Explicitly do OrgUser and User updates in order * CR: Combine rethink queries * Actually we don't need to do those in a specific order * Why are tests broken * Revert "CR: Combine rethink queries" This reverts commit 04ad78d. * Revert "Why are tests broken" This reverts commit eca6417. * Manually bisecting changes that break tests (part 1) * Revert "Manually bisecting changes that break tests (part 1)" This reverts commit db90ead. * Revert "Revert "CR: Combine rethink queries"" This reverts commit a8c21a7. * Fix tests 🤦 * Update trial copy for OrgPlansAndBillingHeading
ParabolInc · Nov 27, 2023 · 7367b94 · 7367b94
1 parent a26050e
commit 7367b94
Show file tree

Hide file tree

Showing 72 changed files with 462 additions and 166 deletions.
diff --git a/codegen.json b/codegen.json
@@ -14,6 +14,7 @@
           "ChangeEmailDomainSuccess": "./types/ChangeEmailDomainSuccess#ChangeEmailDomainSuccessSource",
           "Company": "./queries/company#CompanySource",
           "DraftEnterpriseInvoicePayload": "./types/DraftEnterpriseInvoicePayload#DraftEnterpriseInvoicePayloadSource",
+          "EndTrialSuccess": "./types/EndTrialSuccess#EndTrialSuccessSource",
           "File": "../public/types/File#TFile",
           "FlagConversionModalPayload": "./types/FlagConversionModalPayload#FlagConversionModalPayloadSource",
           "FlagOverLimitPayload": "./types/FlagOverLimitPayload#FlagOverLimitPayloadSource",
@@ -27,6 +28,7 @@
           "SAML": "./types/SAML#SAMLSource",
           "SetIsFreeMeetingTemplateSuccess": "./types/SetIsFreeMeetingTemplateSuccess#SetIsFreeMeetingTemplateSuccessSource",
           "SignupsPayload": "./types/SignupsPayload#SignupsPayloadSource",
+          "StartTrialSuccess": "./types/StartTrialSuccess#StartTrialSuccessSource",
           "StripeFailPaymentPayload": "./mutations/stripeFailPayment#StripeFailPaymentPayloadSource",
           "Team": "../../postgres/queries/getTeamsByIds#Team",
           "UpdateOrgFeatureFlagSuccess": "./types/UpdateOrgFeatureFlagSuccess#UpdateOrgFeatureFlagSuccessSource",
@@ -93,8 +95,8 @@
           "RequestToJoinDomainSuccess": "./types/RequestToJoinDomainSuccess#RequestToJoinDomainSuccessSource",
           "ResetReflectionGroupsSuccess": "./types/ResetReflectionGroupsSuccess#ResetReflectionGroupsSuccessSource",
           "RetrospectiveMeeting": "../../database/types/MeetingRetrospective#default",
-          "SAML": "./types/SAML#SAMLSource",
           "RetrospectiveMeetingSettings": "../../database/types/MeetingSettingsRetrospective#default",
+          "SAML": "./types/SAML#SAMLSource",
           "SetMeetingSettingsPayload": "../types/SetMeetingSettingsPayload#SetMeetingSettingsPayloadSource",
           "SetNotificationStatusPayload": "./types/SetNotificationStatusPayload#SetNotificationStatusPayloadSource",
           "SetOrgUserRoleSuccess": "./types/SetOrgUserRoleSuccess#SetOrgUserRoleSuccessSource",
@@ -114,8 +116,8 @@
           "TemplateDimension": "../../database/types/TemplateDimension#default",
           "TimelineEventTeamPromptComplete": "./types/TimelineEventTeamPromptComplete#TimelineEventTeamPromptCompleteSource",
           "ToggleSummaryEmailSuccess": "./types/ToggleSummaryEmailSuccess#ToggleSummaryEmailSuccessSource",
-          "UpdateAutoJoinSuccess": "./types/UpdateAutoJoinSuccess#UpdateAutoJoinSuccessSource",
           "TopRetroTemplate": "./types/TopRetroTemplate#TopRetroTemplateSource",
+          "UpdateAutoJoinSuccess": "./types/UpdateAutoJoinSuccess#UpdateAutoJoinSuccessSource",
           "UpdateCreditCardSuccess": "./types/UpdateCreditCardSuccess#UpdateCreditCardSuccessSource",
           "UpdateDimensionFieldSuccess": "./types/UpdateDimensionFieldSuccess#UpdateDimensionFieldSuccessSource",
           "UpdateFeatureFlagPayload": "./types/UpdateFeatureFlagPayload#UpdateFeatureFlagPayloadSource",

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -38,7 +38,6 @@ export const query = graphql`
     viewer {
       ...ActivityDetailsSidebar_viewer
       preferredTeamId
-      tier
       activity(activityId: $activityId) {
         ...ActivityDetails_template @relay(mask: false)
       }

diff --git a/packages/client/components/BillingLeaderActionMenu.tsx b/packages/client/components/BillingLeaderActionMenu.tsx
@@ -36,7 +36,7 @@ const BillingLeaderActionMenu = (props: Props) => {
     graphql`
       fragment BillingLeaderActionMenu_organization on Organization {
         id
-        tier
+        billingTier
       }
     `,
     organizationRef
@@ -54,7 +54,7 @@ const BillingLeaderActionMenu = (props: Props) => {
     organizationUserRef
   )
   const atmosphere = useAtmosphere()
-  const {id: orgId, tier} = organization
+  const {id: orgId, billingTier} = organization
   const {viewerId} = atmosphere
   const {newUserUntil, role, user} = organizationUser
   const isBillingLeader = role === 'BILLING_LEADER'
@@ -84,7 +84,7 @@ const BillingLeaderActionMenu = (props: Props) => {
         {viewerId !== userId && (
           <MenuItem
             label={
-              tier === 'team' && new Date(newUserUntil) > new Date()
+              billingTier === 'team' && new Date(newUserUntil) > new Date()
                 ? 'Refund and Remove'
                 : 'Remove from Organization'
             }

diff --git a/packages/client/components/NewTeamOrgDropdown.tsx b/packages/client/components/NewTeamOrgDropdown.tsx
@@ -24,6 +24,7 @@ const NewTeamOrgDropdown = (props: Props) => {
         id
         name
         tier
+        billingTier
       }
     `,
     organizationsRef
@@ -36,14 +37,14 @@ const NewTeamOrgDropdown = (props: Props) => {
     >
       <DropdownMenuLabel>Select Organization:</DropdownMenuLabel>
       {organizations.map((anOrg) => {
-        const {id, tier, name} = anOrg
+        const {id, tier, billingTier, name} = anOrg
         return (
           <MenuItem
             key={id}
             label={
               <DropdownMenuItemLabel>
                 <span>{name}</span>
-                {tier !== 'starter' && <TierTag tier={tier} />}
+                {tier !== 'starter' && <TierTag tier={tier} billingTier={billingTier} />}
               </DropdownMenuItemLabel>
             }
             onClick={() => {

diff --git a/packages/client/components/StandardHub/StandardHub.tsx b/packages/client/components/StandardHub/StandardHub.tsx
@@ -88,7 +88,8 @@ const DEFAULT_VIEWER = {
   picture: '',
   preferredName: '',
   email: '',
-  tier: 'starter'
+  tier: 'starter',
+  billingTier: 'starter'
 } as const
 
 const StandardHub = (props: Props) => {
@@ -100,11 +101,12 @@ const StandardHub = (props: Props) => {
         picture
         preferredName
         tier
+        billingTier
       }
     `,
     viewerRef
   )
-  const {email, picture, preferredName, tier} = viewer || DEFAULT_VIEWER
+  const {email, picture, preferredName, tier, billingTier} = viewer || DEFAULT_VIEWER
   const userAvatar = picture || defaultUserAvatar
   const {history} = useRouter()
   const handleUpgradeClick = () => {
@@ -124,13 +126,13 @@ const StandardHub = (props: Props) => {
           <Email>{email}</Email>
         </NameAndEmail>
       </User>
-      {tier === 'starter' ? (
+      {billingTier === 'starter' ? (
         <Upgrade onClick={handleUpgradeClick}>
           <VerifiedUserIcon />
           <UpgradeCTA>{'Upgrade'}</UpgradeCTA>
         </Upgrade>
       ) : (
-        <Tier tier={tier as TierEnum} />
+        <Tier tier={tier as TierEnum} billingTier={billingTier as TierEnum} />
       )}
     </StandardHubRoot>
   )

diff --git a/packages/client/components/StandardHubUserMenu.tsx b/packages/client/components/StandardHubUserMenu.tsx
@@ -48,15 +48,15 @@ const StandardHubUserMenu = (props: Props) => {
         }
         organizations {
           id
-          tier
+          billingTier
         }
       }
     `,
     viewerRef
   )
   const {email, featureFlags, organizations} = viewer
   const {insights} = featureFlags
-  const ownedFreeOrgs = organizations.filter((org) => org.tier === 'starter')
+  const ownedFreeOrgs = organizations.filter((org) => org.billingTier === 'starter')
   const showUpgradeCTA = ownedFreeOrgs.length > 0
   const routeSuffix = ownedFreeOrgs.length === 1 ? `/${ownedFreeOrgs[0]!.id}` : ''
 

diff --git a/packages/client/components/Tag/TierTag.tsx b/packages/client/components/Tag/TierTag.tsx
@@ -8,6 +8,7 @@ import BaseTag from './BaseTag'
 interface Props {
   className?: string
   tier: TierEnum | null
+  billingTier: TierEnum | null
 }
 
 const StarterTag = styled(BaseTag)({
@@ -26,7 +27,8 @@ const EnterpriseTag = styled(BaseTag)({
 })
 
 const TierTag = (props: Props) => {
-  const {className, tier} = props
+  const {className, tier, billingTier} = props
+  if (tier !== billingTier) return <StarterTag className={className}>{'Free Trial'}</StarterTag>
   if (tier === 'starter') return <StarterTag className={className}>{TierLabel.STARTER}</StarterTag>
   if (tier === 'team') return <TeamTag className={className}>{TierLabel.TEAM}</TeamTag>
   if (tier === 'enterprise')

diff --git a/packages/client/components/ThreadedCommentBase.tsx b/packages/client/components/ThreadedCommentBase.tsx
@@ -66,7 +66,7 @@ const ThreadedCommentBase = (props: Props) => {
     graphql`
       fragment ThreadedCommentBase_viewer on User {
         ...ThreadedItemReply_viewer
-        tier
+        billingTier
       }
     `,
     viewerRef
@@ -140,7 +140,7 @@ const ThreadedCommentBase = (props: Props) => {
     if (createdByUserNullable?.id === PARABOL_AI_USER_ID) {
       SendClientSideEvent(atmosphere, 'AI Summary Viewed', {
         source: 'Discussion',
-        tier: viewer.tier,
+        tier: viewer.billingTier,
         meetingId,
         discussionTopicId
       })

diff --git a/packages/client/hooks/useUsageSnackNag.ts b/packages/client/hooks/useUsageSnackNag.ts
@@ -17,10 +17,10 @@ const getIsNaggingPath = (history: RouterProps['history']) => {
   return !(pathname.includes('/usage') || pathname.includes('/meet/'))
 }
 
-const shouldNag = (tier: TierEnum, suggestedTier: TierEnum | null) => {
+const shouldNag = (billingTier: TierEnum, suggestedTier: TierEnum | null) => {
   if (!suggestedTier) return false
-  const suggestPro = suggestedTier === 'team' && tier === 'starter'
-  const suggestEnterprise = suggestedTier === 'enterprise' && tier !== 'enterprise'
+  const suggestPro = suggestedTier === 'team' && billingTier === 'starter'
+  const suggestEnterprise = suggestedTier === 'enterprise' && billingTier !== 'enterprise'
   return suggestPro || suggestEnterprise
 }
 

diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts
@@ -293,6 +293,7 @@ const initDemoOrg = () => {
     id: demoOrgId,
     name: 'Demo Organization',
     tier: 'team',
+    billingTier: 'team',
     orgUserCount: {
       activeUserCount: 5,
       inactiveUserCount: 0
@@ -327,6 +328,7 @@ const initDemoTeam = (
     teamName: demoTeamName,
     orgId: demoOrgId,
     tier: 'team',
+    billingTier: 'team',
     teamId: demoTeamId,
     organization,
     meetingSettings: initMeetingSettings(),

diff --git a/...t/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/...t/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
@@ -49,6 +49,7 @@ const WholeMeetingSummaryResult = (props: Props) => {
         summary
         team {
           tier
+          billingTier
         }
       }
     `,
@@ -60,7 +61,7 @@ const WholeMeetingSummaryResult = (props: Props) => {
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'AI Summary Viewed', {
       source: 'Meeting Summary',
-      tier: meeting.team.tier,
+      tier: meeting.team.billingTier,
       meetingId: meeting.id
     })
   }, [])

diff --git a/packages/client/modules/invoice/components/InvoiceHeader/InvoiceHeader.tsx b/packages/client/modules/invoice/components/InvoiceHeader/InvoiceHeader.tsx
@@ -84,7 +84,7 @@ const InvoiceHeader = (props: Props) => {
       </LogoPanel>
       <Info>
         <OrgName>{orgName}</OrgName>
-        {tier !== 'starter' && <StyledTierTag tier={tier} />}
+        {tier !== 'starter' && <StyledTierTag billingTier={tier} tier={tier} />}
         {billingLeaderEmails.map((email) => (
           <Email key={`email${email}`}>{email}</Email>
         ))}

diff --git a/packages/client/modules/team/components/NewTeamOrgPicker.tsx b/packages/client/modules/team/components/NewTeamOrgPicker.tsx
@@ -50,6 +50,7 @@ const NewTeamOrgPicker = (props: Props) => {
         id
         name
         tier
+        billingTier
       }
     `,
     organizationsRef
@@ -85,7 +86,9 @@ const NewTeamOrgPicker = (props: Props) => {
         defaultText={
           <MenuToggleInner>
             <MenuToggleLabel>{defaultText}</MenuToggleLabel>
-            {org && org.tier !== 'starter' && <TierTag tier={org.tier} />}
+            {org && org.tier !== 'starter' && (
+              <TierTag tier={org.tier} billingTier={org.billingTier} />
+            )}
           </MenuToggleInner>
         }
       />

diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
@@ -47,6 +47,7 @@ const query = graphql`
         id
         name
         tier
+        billingTier
         orgId
         teamMembers(sortBy: "preferredName") {
           teamMemberId: id
@@ -67,7 +68,7 @@ const TeamSettings = (props: Props) => {
   const {viewer} = data
   const {history} = useRouter()
   const {team} = viewer
-  const {name: teamName, orgId, teamMembers, tier} = team!
+  const {name: teamName, orgId, teamMembers, tier, billingTier} = team!
   useDocumentTitle(`Team Settings | ${teamName}`, 'Team Settings')
   const viewerTeamMember = teamMembers.find((m) => m.isSelf)
   // if kicked out, the component might reload before the redirect occurs
@@ -78,10 +79,14 @@ const TeamSettings = (props: Props) => {
   return (
     <TeamSettingsLayout>
       <PanelsLayout>
-        {tier === 'starter' && (
+        {billingTier === 'starter' && (
           <Panel>
             <StyledRow>
-              <div>{'This team is currently on a starter plan.'}</div>
+              <div>
+                {tier !== 'starter'
+                  ? `This team is currently on a free trial for the ${TierLabel.TEAM} plan.`
+                  : 'This team is currently on a starter plan.'}
+              </div>
               <PrimaryButton onClick={() => history.push(`/me/organizations/${orgId}`)}>
                 {`Upgrade Team to ${TierLabel.TEAM}`}
               </PrimaryButton>
@@ -98,8 +103,8 @@ const TeamSettings = (props: Props) => {
           <Panel className='mt-8'>
             <StyledRow>
               <div>
-                This team is currently on a <b className='capitalize'>{tier} plan</b>. Only Team
-                Leads can <b>Upgrade plans</b> and <b>Delete a team</b>.<br />
+                This team is currently on a <b className='capitalize'>{billingTier} plan</b>. Only
+                Team Leads can <b>Upgrade plans</b> and <b>Delete a team</b>.<br />
                 The <b>Team Lead</b> for {teamName} is{' '}
                 <a href={`mailto:${contact.email}`} className='text-sky-500 underline'>
                   {contact.preferredName}

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx
@@ -40,17 +40,17 @@ const OrgBilling = (props: Props) => {
         ...OrgBillingUpgrade_organization
         ...OrgBillingDangerZone_organization
         id
-        tier
+        billingTier
       }
     `,
     organizationRef
   )
-  const {tier} = organization
+  const {billingTier} = organization
 
   return (
     <div>
       <OrgBillingUpgrade organization={organization} invoiceListRefetch={refetch} />
-      {tier === 'team' && (
+      {billingTier === 'team' && (
         <>
           <OrgBillingCreditCardInfoOld organization={organization} />
           <OrgBillingInvoices queryRef={queryData} />

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
@@ -59,14 +59,14 @@ const OrgBillingDangerZone = (props: Props) => {
       fragment OrgBillingDangerZone_organization on Organization {
         ...ArchiveOrganization_organization
         isBillingLeader
-        tier
+        billingTier
       }
     `,
     organizationRef
   )
-  const {isBillingLeader, tier} = organization
+  const {isBillingLeader, billingTier} = organization
   if (!isBillingLeader) return null
-  const isStarter = tier === 'starter'
+  const isStarter = billingTier === 'starter'
   return (
     <StyledPanel isWide={isWide} label='Danger Zone'>
       <PanelRow>

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx
@@ -47,15 +47,15 @@ const OrgBillingUpgrade = (props: Props) => {
     graphql`
       fragment OrgBillingUpgrade_organization on Organization {
         id
-        tier
+        billingTier
         orgUserCount {
           activeUserCount
         }
       }
     `,
     organizationRef
   )
-  const {id: orgId, tier, orgUserCount} = organization
+  const {id: orgId, billingTier, orgUserCount} = organization
   const {activeUserCount} = orgUserCount
   const {togglePortal, closePortal, modalPortal} = useModal()
   const onUpgrade = () => invoiceListRefetch?.({orgId, first: 3})
@@ -70,7 +70,7 @@ const OrgBillingUpgrade = (props: Props) => {
           activeUserCount={activeUserCount}
         />
       )}
-      {tier === 'starter' && (
+      {billingTier === 'starter' && (
         <Panel>
           <Inner>
             <Title>Upgrade</Title>