🚑 Fix can invite new members in workspace bool

Closes #964
baptisteArno · Oct 25, 2023 · 53558dc · 53558dc
1 parent 4b248d5
commit 53558dc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/apps/builder/src/features/billing/components/UsageProgressBars.tsx b/apps/builder/src/features/billing/components/UsageProgressBars.tsx
@@ -32,9 +32,10 @@ export const UsageProgressBars = ({ workspace }: Props) => {
 
   const workspaceChatsLimit = getChatsLimit(workspace)
 
-  const chatsPercentage = Math.round(
-    (totalChatsUsed / workspaceChatsLimit) * 100
-  )
+  const chatsPercentage =
+    workspaceChatsLimit === 'inf'
+      ? 0
+      : Math.round((totalChatsUsed / workspaceChatsLimit) * 100)
 
   return (
     <Stack spacing={6}>
@@ -79,7 +80,7 @@ export const UsageProgressBars = ({ workspace }: Props) => {
             </Skeleton>
             <Text>
               /{' '}
-              {workspaceChatsLimit === -1
+              {workspaceChatsLimit === 'inf'
                 ? scopedT('unlimited')
                 : parseNumberWithCommas(workspaceChatsLimit)}
             </Text>

diff --git a/apps/builder/src/features/workspace/components/MembersList.tsx b/apps/builder/src/features/workspace/components/MembersList.tsx
@@ -92,9 +92,12 @@ export const MembersList = () => {
 
   const seatsLimit = workspace ? getSeatsLimit(workspace) : undefined
 
-  const canInviteNewMember = workspace
-    ? currentMembersCount < (seatsLimit as number)
-    : false
+  const canInviteNewMember =
+    seatsLimit === 'inf'
+      ? true
+      : seatsLimit
+      ? currentMembersCount < seatsLimit
+      : false
 
   return (
     <Stack w="full" spacing={3}>

diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts
@@ -36,9 +36,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
           where: { workspaceId: workspace.id },
         }),
       ])
+    const seatsLimit = getSeatsLimit(workspace)
     if (
-      getSeatsLimit(workspace) <=
-      existingMembersCount + existingInvitationsCount
+      seatsLimit !== 'inf' &&
+      seatsLimit <= existingMembersCount + existingInvitationsCount
     )
       return res.status(400).send('Seats limit reached')
     if (existingUser) {

diff --git a/packages/lib/billing/getChatsLimit.ts b/packages/lib/billing/getChatsLimit.ts
@@ -13,7 +13,7 @@ export const getChatsLimit = ({
     plan === Plan.LIFETIME ||
     plan === Plan.OFFERED
   )
-    return -1
-  if (plan === Plan.CUSTOM) return customChatsLimit ?? -1
+    return 'inf'
+  if (plan === Plan.CUSTOM) return customChatsLimit ?? 'inf'
   return chatsLimits[plan]
 }
diff --git a/packages/lib/billing/getSeatsLimit.ts b/packages/lib/billing/getSeatsLimit.ts
@@ -6,7 +6,7 @@ export const getSeatsLimit = ({
   plan,
   customSeatsLimit,
 }: Pick<Workspace, 'plan' | 'customSeatsLimit'>) => {
-  if (plan === Plan.UNLIMITED) return -1
-  if (plan === Plan.CUSTOM) return customSeatsLimit ? customSeatsLimit : -1
+  if (plan === Plan.UNLIMITED) return 'inf'
+  if (plan === Plan.CUSTOM) return customSeatsLimit ? customSeatsLimit : 'inf'
   return seatsLimits[plan]
 }
diff --git a/packages/scripts/checkAndReportChatsUsage.ts b/packages/scripts/checkAndReportChatsUsage.ts
@@ -110,6 +110,7 @@ export const checkAndReportChatsUsage = async () => {
       workspaceId: result.workspace.id,
       subscription,
     })
+    if (chatsLimit === 'inf') continue
     if (
       chatsLimit > 0 &&
       totalChatsUsed >= chatsLimit * LIMIT_EMAIL_TRIGGER_PERCENT &&