chore: remove noTemplateLimit flag (#9631)

ParabolInc · Apr 18, 2024 · fb76d9a · fb76d9a
1 parent 9944ac0
commit fb76d9a
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 86 deletions.
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -23,7 +23,6 @@ graphql`
     orgId
     teamId
     illustrationUrl
-    isFree
     scope
     viewerLowestScope
     ...TemplateDetails_activity
@@ -78,7 +77,6 @@ const ActivityDetails = (props: Props) => {
       meetingType: activity.type,
       scope: activity.scope,
       templateName: activity.name,
-      isFree: activity.isFree,
       queryString: activityLibrarySearch
     })
   }, [])

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -132,18 +132,16 @@ export const TemplateDetails = (props: Props) => {
   const viewer = useFragment(
     graphql`
       fragment TemplateDetails_user on User {
-        tier
         preferredTeamId
         teams {
           ...TeamPickerModal_teams
         }
-        ...useTemplateDescription_viewer
       }
     `,
     viewerRef
   )
 
-  const {teams, tier, preferredTeamId} = viewer
+  const {teams, preferredTeamId} = viewer
   const history = useHistory<{prevCategory?: string; edit?: boolean}>()
   const prevCategory = history.location.state?.prevCategory
 
@@ -201,7 +199,7 @@ export const TemplateDetails = (props: Props) => {
 
   const isOwner = viewerLowestScope === 'TEAM'
 
-  const description = useTemplateDescription(viewerLowestScope, activity, tier, viewer)
+  const description = useTemplateDescription(viewerLowestScope, activity)
 
   useEffect(() => {
     setIsEditing(!!history.location.state?.edit)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -57,7 +57,6 @@ const ActivityDetailsSidebar = (props: Props) => {
         teamId
         orgId
         scope
-        isFree
       }
     `,
     selectedTemplateRef

diff --git a/packages/client/utils/useTemplateDescription.ts b/packages/client/utils/useTemplateDescription.ts
@@ -1,15 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {readInlineData} from 'react-relay'
-import {TierEnum} from '../__generated__/OrganizationSubscription.graphql'
 import {useTemplateDescription_template$key} from '../__generated__/useTemplateDescription_template.graphql'
-import {useTemplateDescription_viewer$key} from '../__generated__/useTemplateDescription_viewer.graphql'
 import relativeDate from './date/relativeDate'
 
 const useTemplateDescription = (
   lowestScope: string,
-  templateRef?: useTemplateDescription_template$key,
-  tier?: TierEnum,
-  viewerRef?: useTemplateDescription_viewer$key
+  templateRef?: useTemplateDescription_template$key
 ) => {
   if (!templateRef) {
     return null
@@ -20,7 +16,6 @@ const useTemplateDescription = (
       fragment useTemplateDescription_template on MeetingTemplate @inline {
         lastUsedAt
         scope
-        isFree
         team {
           name
         }
@@ -29,26 +24,10 @@ const useTemplateDescription = (
     templateRef
   )
 
-  const viewer = readInlineData(
-    graphql`
-      fragment useTemplateDescription_viewer on User @inline {
-        id
-        featureFlags {
-          noTemplateLimit
-        }
-      }
-    `,
-    viewerRef ?? null
-  )
-
-  const {lastUsedAt, team, isFree} = template
+  const {lastUsedAt, team} = template
   const {name: teamName} = team
   if (lowestScope === 'PUBLIC') {
-    return isFree
-      ? 'Free template'
-      : `Premium template ${
-          tier === 'starter' && !viewer?.featureFlags?.noTemplateLimit ? '🔒' : '✨'
-        }`
+    return 'Public template'
   }
   if (lowestScope === 'TEAM')
     return lastUsedAt

diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -53,16 +53,6 @@ const bootstrapNewUser = async (
     experimentalFlags.push('signUpDestinationTeam')
   }
 
-  // No template limit
-  const domainUserHasNoTemplateLimitFlag = usersWithDomain.some((user) =>
-    user.featureFlags.includes('noTemplateLimit')
-  )
-  if (domainUserHasNoTemplateLimitFlag) {
-    experimentalFlags.push('noTemplateLimit')
-  } else if (Math.random() < 0.5) {
-    experimentalFlags.push('noTemplateLimit')
-  }
-
   const isVerified = identities.some((identity) => identity.isEmailVerified)
   const hasSAMLURL = !!(await getSAMLURLFromEmail(email, dataLoader, false))
   const isQualifiedForAutoJoin = (isVerified || hasSAMLURL) && isCompanyDomain

diff --git a/packages/server/graphql/mutations/selectTemplate.ts b/packages/server/graphql/mutations/selectTemplate.ts
@@ -8,7 +8,6 @@ import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import SelectTemplatePayload from '../types/SelectTemplatePayload'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
 
 const selectTemplate = {
   description: 'Set the selected template for the upcoming retro meeting',
@@ -32,17 +31,16 @@ const selectTemplate = {
     const viewerId = getUserId(authToken)
 
     // AUTH
-    const [template, viewer] = await Promise.all([
-      dataLoader.get('meetingTemplates').load(selectedTemplateId) as Promise<MeetingTemplate>,
-      dataLoader.get('users').loadNonNull(viewerId)
+    const [template] = await Promise.all([
+      dataLoader.get('meetingTemplates').load(selectedTemplateId) as Promise<MeetingTemplate>
     ])
 
     if (!template || !template.isActive) {
       Logger.log('no template', selectedTemplateId, template)
       return standardError(new Error('Template not found'), {userId: viewerId})
     }
 
-    const {scope, isFree} = template
+    const {scope} = template
     const viewerTeam = await dataLoader.get('teams').loadNonNull(teamId)
     if (scope === 'TEAM') {
       if (!isTeamMember(authToken, template.teamId))
@@ -52,16 +50,6 @@ const selectTemplate = {
       if (viewerTeam.orgId !== templateTeam.orgId) {
         return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
       }
-    } else if (scope === 'PUBLIC') {
-      if (
-        !isFree &&
-        !viewer.featureFlags.includes('noTemplateLimit') &&
-        getFeatureTier(viewerTeam) === 'starter'
-      ) {
-        return standardError(new Error('User does not have access to this premium template'), {
-          userId: viewerId
-        })
-      }
     }
 
     // RESOLUTION

diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -8,7 +8,6 @@ enum UserFlagEnum {
   noAISummary
   noMeetingHistoryLimit
   adHocTeams
-  noTemplateLimit
   signUpDestinationTeam
 }
 
@@ -22,7 +21,6 @@ type UserFeatureFlags {
   noAISummary: Boolean!
   noMeetingHistoryLimit: Boolean!
   adHocTeams: Boolean!
-  noTemplateLimit: Boolean!
   signUpDestinationTeam: Boolean!
 }
 

diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -5,7 +5,6 @@ const UserFeatureFlags: UserFeatureFlagsResolvers = {
   noAISummary: ({noAISummary}) => !!noAISummary,
   noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit,
   adHocTeams: ({adHocTeams}) => !!adHocTeams,
-  noTemplateLimit: ({noTemplateLimit}) => !!noTemplateLimit,
   signUpDestinationTeam: ({signUpDestinationTeam}) => !!signUpDestinationTeam
 }
 

diff --git a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
@@ -1,41 +1,19 @@
 import getRethink from '../../../database/rethinkDriver'
 import MeetingSettingsPoker from '../../../database/types/MeetingSettingsPoker'
 import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
-import {getUserId} from '../../../utils/authorization'
 import {GQLContext} from '../../graphql'
-import isValid from '../../isValid'
-import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
 const resolveSelectedTemplate =
   (fallbackTemplateId: string) =>
   async (
     source: MeetingSettingsPoker | MeetingSettingsRetrospective,
     _args: unknown,
-    {authToken, dataLoader}: GQLContext
+    {dataLoader}: GQLContext
   ) => {
-    const viewerId = getUserId(authToken)
-    const {id: settingsId, selectedTemplateId, teamId} = source
-    const [team, template, viewer] = await Promise.all([
-      dataLoader.get('teams').loadNonNull(teamId),
-      dataLoader.get('meetingTemplates').load(selectedTemplateId),
-      dataLoader.get('users').loadNonNull(viewerId)
-    ])
+    const {id: settingsId, selectedTemplateId} = source
+    const template = await dataLoader.get('meetingTemplates').load(selectedTemplateId)
     if (template) {
-      if (
-        template.isFree ||
-        template.scope !== 'PUBLIC' ||
-        getFeatureTier(team) !== 'starter' ||
-        viewer.featureFlags.includes('noTemplateLimit')
-      ) {
-        return template
-      }
-      // if anyone on the team has the noTemplateLimit flag, they might have selected a non-starter template
-      const teamMembers = await dataLoader.get('teamMembersByTeamId').load(teamId)
-      const userIds = teamMembers.map(({userId}) => userId)
-      const users = (await dataLoader.get('users').loadMany(userIds)).filter(isValid)
-      if (users.some(({featureFlags}) => featureFlags.includes('noTemplateLimit'))) {
-        return template
-      }
+      return template
     }
     // there may be holes in our template deletion or reselection logic, so doing this to be safe
     source.selectedTemplateId = fallbackTemplateId

diff --git a/packages/server/graphql/types/UserFlagEnum.ts b/packages/server/graphql/types/UserFlagEnum.ts
@@ -8,7 +8,6 @@ const UserFlagEnum = new GraphQLEnumType({
     noAISummary: {},
     noMeetingHistoryLimit: {},
     adHocTeams: {},
-    noTemplateLimit: {},
     signUpDestinationTeam: {}
   }
 })