🐛 (usage) Archive typebot to be able to compute usage

baptisteArno · Oct 1, 2022 · 15dbc95 · 15dbc95 · vercel · Oct 1, 2022
1 parent 75ca255
commit 15dbc95
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 84 deletions.
diff --git a/apps/builder/components/dashboard/DashboardHeader.tsx b/apps/builder/components/dashboard/DashboardHeader.tsx
@@ -26,6 +26,7 @@ import { useWorkspace } from 'contexts/WorkspaceContext'
 import { EmojiOrImageIcon } from 'components/shared/EmojiOrImageIcon'
 import { WorkspaceSettingsModal } from './WorkspaceSettingsModal'
 import { isNotDefined } from 'utils'
+import { PlanTag } from 'components/shared/PlanTag'
 
 export const DashboardHeader = () => {
   const { user } = useUser()
@@ -90,9 +91,13 @@ export const DashboardHeader = () => {
                   />
                 </SkeletonCircle>
                 {workspace && (
+                  <>
                   <Text noOfLines={1} maxW="200px">
                     {workspace.name}
                   </Text>
+                  <PlanTag plan={workspace.plan}/>
+                  </>
+
                 )}
                 <ChevronLeftIcon transform="rotate(-90deg)" />
               </HStack>
@@ -112,6 +117,7 @@ export const DashboardHeader = () => {
                         defaultIcon={HardDriveIcon}
                       />
                       <Text>{workspace.name}</Text>
+                      <PlanTag plan={workspace.plan}/>
                     </HStack>
                   </MenuItem>
                 ))}

diff --git a/apps/builder/components/dashboard/FolderContent/CreateFolderButton.tsx b/apps/builder/components/dashboard/FolderContent/CreateFolderButton.tsx
@@ -1,10 +1,10 @@
 import { Button, HStack, useDisclosure, Text } from '@chakra-ui/react'
 import { FolderPlusIcon } from 'assets/icons'
+import { LockTag } from 'components/shared/LockTag'
 import {
   LimitReached,
   ChangePlanModal,
 } from 'components/shared/modals/ChangePlanModal'
-import { PlanTag } from 'components/shared/PlanTag'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
 import React from 'react'
@@ -28,7 +28,7 @@ export const CreateFolderButton = ({ isLoading, onClick }: Props) => {
     >
       <HStack>
         <Text>Create a folder</Text>
-        {isFreePlan(workspace) && <PlanTag plan={Plan.STARTER} />}
+        {isFreePlan(workspace) && <LockTag plan={Plan.STARTER} />}
       </HStack>
       <ChangePlanModal
         isOpen={isOpen}

diff --git a/...components/dashboard/WorkspaceSettingsModal/BillingContent/CurrentSubscriptionContent.tsx b/...components/dashboard/WorkspaceSettingsModal/BillingContent/CurrentSubscriptionContent.tsx
@@ -46,7 +46,7 @@ export const CurrentSubscriptionContent = ({
   return (
     <Stack gap="2">
       <Heading fontSize="3xl">Subscription</Heading>
-      <HStack>
+      <HStack data-testid="current-subscription">
         <Text>Current workspace subscription: </Text>
         {isCancelling ? (
           <Spinner color="gray.500" size="xs" />

diff --git a/apps/builder/components/editor/BlocksSideBar/BlockTypeLabel.tsx b/apps/builder/components/editor/BlocksSideBar/BlockTypeLabel.tsx
@@ -1,5 +1,5 @@
 import { HStack, Text, Tooltip } from '@chakra-ui/react'
-import { PlanTag } from 'components/shared/PlanTag'
+import { LockTag } from 'components/shared/LockTag'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
 import {
@@ -54,7 +54,7 @@ export const BlockTypeLabel = ({ type }: Props): JSX.Element => {
         <Tooltip label="Upload Files">
           <HStack>
             <Text>File</Text>
-            {isFreePlan(workspace) && <PlanTag plan={Plan.STARTER} />}
+            {isFreePlan(workspace) && <LockTag plan={Plan.STARTER} />}
           </HStack>
         </Tooltip>
       )

diff --git a/apps/builder/components/settings/GeneralSettingsForm.tsx b/apps/builder/components/settings/GeneralSettingsForm.tsx
@@ -1,9 +1,9 @@
 import { Flex, FormLabel, Stack, Switch, useDisclosure } from '@chakra-ui/react'
+import { LockTag } from 'components/shared/LockTag'
 import {
   ChangePlanModal,
   LimitReached,
 } from 'components/shared/modals/ChangePlanModal'
-import { PlanTag } from 'components/shared/PlanTag'
 import { SwitchWithLabel } from 'components/shared/SwitchWithLabel'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
@@ -66,7 +66,7 @@ export const GeneralSettingsForm = ({
       >
         <FormLabel htmlFor="branding" mb="0">
           Typebot.io branding{' '}
-          {isWorkspaceFreePlan && <PlanTag plan={Plan.STARTER} />}
+          {isWorkspaceFreePlan && <LockTag plan={Plan.STARTER} />}
         </FormLabel>
         <Switch
           id="branding"

diff --git a/apps/builder/components/share/ShareContent.tsx b/apps/builder/components/share/ShareContent.tsx
@@ -10,8 +10,8 @@ import {
 import { TrashIcon } from 'assets/icons'
 import { UpgradeButton } from 'components/shared/buttons/UpgradeButton'
 import { useToast } from 'components/shared/hooks/useToast'
+import { LockTag } from 'components/shared/LockTag'
 import { LimitReached } from 'components/shared/modals/ChangePlanModal'
-import { PlanTag } from 'components/shared/PlanTag'
 import { useTypebot } from 'contexts/TypebotContext/TypebotContext'
 import { useWorkspace } from 'contexts/WorkspaceContext'
 import { Plan } from 'db'
@@ -82,19 +82,22 @@ export const ShareContent = () => {
               />
             </HStack>
           )}
-          {isWorkspaceProPlan(workspace) &&
-          isNotDefined(typebot?.customDomain) ? (
-            <CustomDomainsDropdown
-              onCustomDomainSelect={handleCustomDomainChange}
-            />
-          ) : (
-            <UpgradeButton
-              colorScheme="gray"
-              limitReachedType={LimitReached.CUSTOM_DOMAIN}
-            >
-              <Text mr="2">Add my domain</Text> <PlanTag plan={Plan.PRO} />
-            </UpgradeButton>
-          )}
+          {isNotDefined(typebot?.customDomain) ? (
+            <>
+              {isWorkspaceProPlan(workspace) ? (
+                <CustomDomainsDropdown
+                  onCustomDomainSelect={handleCustomDomainChange}
+                />
+              ) : (
+                <UpgradeButton
+                  colorScheme="gray"
+                  limitReachedType={LimitReached.CUSTOM_DOMAIN}
+                >
+                  <Text mr="2">Add my domain</Text> <LockTag plan={Plan.PRO} />
+                </UpgradeButton>
+              )}
+            </>
+          ) : null}
         </Stack>
 
         <Stack spacing={4}>

diff --git a/apps/builder/components/shared/LockTag.tsx b/apps/builder/components/shared/LockTag.tsx
@@ -0,0 +1,14 @@
+import { Tag, TagProps } from '@chakra-ui/react'
+import { LockedIcon } from 'assets/icons'
+import { Plan } from 'db'
+import { planColorSchemes } from './PlanTag'
+
+export const LockTag = ({ plan, ...props }: { plan?: Plan } & TagProps) => (
+  <Tag
+    colorScheme={plan ? planColorSchemes[plan] : 'gray'}
+    data-testid={`${plan?.toLowerCase()}-lock-tag`}
+    {...props}
+  >
+    <LockedIcon />
+  </Tag>
+)
diff --git a/apps/builder/components/shared/PlanTag.tsx b/apps/builder/components/shared/PlanTag.tsx
@@ -1,33 +1,57 @@
-import { Tag, TagProps } from '@chakra-ui/react'
+import { Tag, TagProps, ThemeTypings } from '@chakra-ui/react'
 import { Plan } from 'db'
 
+export const planColorSchemes: Record<Plan, ThemeTypings['colorSchemes']> = {
+  [Plan.LIFETIME]: 'purple',
+  [Plan.PRO]: 'blue',
+  [Plan.OFFERED]: 'orange',
+  [Plan.STARTER]: 'orange',
+  [Plan.FREE]: 'gray',
+}
+
 export const PlanTag = ({ plan, ...props }: { plan?: Plan } & TagProps) => {
   switch (plan) {
     case Plan.LIFETIME: {
       return (
-        <Tag colorScheme="purple" data-testid="lifetime-plan-tag" {...props}>
+        <Tag
+          colorScheme={planColorSchemes[plan]}
+          data-testid="lifetime-plan-tag"
+          {...props}
+        >
           Lifetime
         </Tag>
       )
     }
     case Plan.PRO: {
       return (
-        <Tag colorScheme="blue" data-testid="pro-plan-tag" {...props}>
+        <Tag
+          colorScheme={planColorSchemes[plan]}
+          data-testid="pro-plan-tag"
+          {...props}
+        >
           Pro
         </Tag>
       )
     }
     case Plan.OFFERED:
     case Plan.STARTER: {
       return (
-        <Tag colorScheme="orange" data-testid="starter-plan-tag" {...props}>
+        <Tag
+          colorScheme={planColorSchemes[plan]}
+          data-testid="starter-plan-tag"
+          {...props}
+        >
           Starter
         </Tag>
       )
     }
     default: {
       return (
-        <Tag colorScheme="gray" data-testid="free-plan-tag" {...props}>
+        <Tag
+          colorScheme={planColorSchemes[Plan.FREE]}
+          data-testid="free-plan-tag"
+          {...props}
+        >
           Free
         </Tag>
       )

diff --git a/apps/builder/contexts/WorkspaceContext.tsx b/apps/builder/contexts/WorkspaceContext.tsx
@@ -139,13 +139,14 @@ export const WorkspaceContext = ({ children }: WorkspaceContextProps) => {
     if (!currentWorkspace || !workspaces || workspaces.length < 2) return
     const { data } = await deleteWorkspace(currentWorkspace.id)
     if (!data || !currentWorkspace) return
-    setCurrentWorkspace(workspaces[0])
+    const newWorkspaces = (workspaces ?? []).filter((w) =>
+      w.id === currentWorkspace.id
+        ? { ...data.workspace, members: w.members }
+        : w
+    )
+    setCurrentWorkspace(newWorkspaces[0])
     mutate({
-      workspaces: (workspaces ?? []).filter((w) =>
-        w.id === currentWorkspace.id
-          ? { ...data.workspace, members: w.members }
-          : w
-      ),
+      workspaces: newWorkspaces,
     })
   }
 

diff --git a/apps/builder/pages/api/typebots.ts b/apps/builder/pages/api/typebots.ts
@@ -31,6 +31,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
               {
                 workspace: { members: { some: { userId: user.id } } },
                 id: { in: typebotIds },
+                isArchived: { not: true },
               },
               {
                 id: { in: typebotIds },
@@ -39,6 +40,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
                     userId: user.id,
                   },
                 },
+                isArchived: { not: true },
               },
             ],
           },
@@ -51,6 +53,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         where: {
           OR: [
             {
+              isArchived: { not: true },
               folderId,
               workspace: {
                 id: workspaceId,
@@ -63,6 +66,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
               },
             },
             {
+              isArchived: { not: true },
               workspace: {
                 id: workspaceId,
                 members: {

diff --git a/apps/builder/pages/api/typebots/[typebotId].ts b/apps/builder/pages/api/typebots/[typebotId].ts
@@ -13,13 +13,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const typebotId = req.query.typebotId as string
   if (req.method === 'GET') {
     const typebot = await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
+      where: {
+        ...canReadTypebot(typebotId, user),
+        isArchived: { not: true },
+      },
       include: {
         publishedTypebot: true,
         collaborators: { select: { userId: true, type: true } },
         webhooks: true,
       },
     })
+    console.log(typebot)
     if (!typebot) return res.send({ typebot: null })
     const { publishedTypebot, collaborators, webhooks, ...restOfTypebot } =
       typebot
@@ -35,8 +39,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   }
 
   if (req.method === 'DELETE') {
-    const typebots = await prisma.typebot.deleteMany({
+    const typebots = await prisma.typebot.updateMany({
       where: canWriteTypebot(typebotId, user),
+      data: { isArchived: true },
     })
     await archiveResults(res)({
       typebotId,

diff --git a/apps/builder/pages/api/workspaces/[workspaceId].ts b/apps/builder/pages/api/workspaces/[workspaceId].ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import { Prisma, Workspace, WorkspaceRole } from 'db'
 import prisma from 'libs/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { archiveResults, getAuthenticatedUser } from 'services/api/utils'
+import { getAuthenticatedUser } from 'services/api/utils'
 import { methodNotAllowed, notAuthenticated } from 'utils/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
@@ -28,23 +28,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       id,
       members: { some: { userId: user.id, role: WorkspaceRole.ADMIN } },
     }
-    const deletedTypebots = await prisma.typebot.findMany({
-      where: {
-        workspace: workspaceFilter,
-      },
-    })
     await prisma.workspace.deleteMany({
       where: workspaceFilter,
     })
-    await Promise.all(
-      deletedTypebots.map((typebot) =>
-        archiveResults(res)({
-          typebotId: typebot.id,
-          user,
-          resultsFilter: { typebotId: typebot.id },
-        })
-      )
-    )
     return res.status(200).json({
       message: 'success',
     })

diff --git a/apps/builder/playwright/services/database.ts b/apps/builder/playwright/services/database.ts
@@ -102,14 +102,16 @@ export const setupDatabase = async () => {
   return setupCredentials()
 }
 
-export const setupWorkspaces = async () =>
-  prisma.workspace.createMany({
+export const setupWorkspaces = async () => {
+  await prisma.workspace.create({
+    data: {
+      id: freeWorkspaceId,
+      name: 'Free workspace',
+      plan: Plan.FREE,
+    },
+  })
+  await prisma.workspace.createMany({
     data: [
-      {
-        id: freeWorkspaceId,
-        name: 'Free workspace',
-        plan: Plan.FREE,
-      },
       {
         id: starterWorkspaceId,
         name: 'Starter workspace',
@@ -128,6 +130,7 @@ export const setupWorkspaces = async () =>
       },
     ],
   })
+}
 
 export const createWorkspaces = async (workspaces: Partial<Workspace>[]) => {
   const workspaceIds = workspaces.map((workspace) => workspace.id ?? cuid())
@@ -231,11 +234,15 @@ export const getSignedInUser = (email: string) =>
   prisma.user.findFirst({ where: { email } })
 
 export const createTypebots = async (partialTypebots: Partial<Typebot>[]) => {
+  const typebotsWithId = partialTypebots.map((typebot) => ({
+    ...typebot,
+    id: typebot.id ?? cuid(),
+  }))
   await prisma.typebot.createMany({
-    data: partialTypebots.map(parseTestTypebot),
+    data: typebotsWithId.map(parseTestTypebot),
   })
   return prisma.publicTypebot.createMany({
-    data: partialTypebots.map((t) =>
+    data: typebotsWithId.map((t) =>
       parseTypebotToPublicTypebot(t.id + '-public', parseTestTypebot(t))
     ),
   })
@@ -304,7 +311,7 @@ const parseTypebotToPublicTypebot = (
 })
 
 const parseTestTypebot = (partialTypebot: Partial<Typebot>): Typebot => ({
-  id: partialTypebot.id ?? 'typebot',
+  id: cuid(),
   workspaceId: proWorkspaceId,
   folderId: null,
   name: 'My typebot',