🐛 Remove delete result cascade

2022-09-25 20:16:08 +02:00
parent 30dff2d5d7
commit 3c803b1345
11 changed files with 396 additions and 180 deletions
--- a/apps/builder/assets/logos/StripeClimateLogo.tsx
+++ b/apps/builder/assets/logos/StripeClimateLogo.tsx
@@ -0,0 +1,61 @@
+import { Icon, IconProps } from '@chakra-ui/react'
+
+export const StripeClimateLogo = (props: IconProps) => (
+  <Icon
+    width="24px"
+    height="24px"
+    viewBox="0 0 32 32"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <linearGradient
+      id="StripeClimate-gradient-a"
+      gradientUnits="userSpaceOnUse"
+      x1="16"
+      y1="20.6293"
+      x2="16"
+      y2="7.8394"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset="0" stop-color="#00d924" />
+      <stop offset="1" stop-color="#00cb1b" />
+    </linearGradient>
+    <path
+      d="M0 10.82h32c0 8.84-7.16 16-16 16s-16-7.16-16-16z"
+      fill="url(#StripeClimate-gradient-a)"
+    />
+    <linearGradient
+      id="StripeClimate-gradient-b"
+      gradientUnits="userSpaceOnUse"
+      x1="24"
+      y1="28.6289"
+      x2="24"
+      y2="17.2443"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset=".1562" stop-color="#009c00" />
+      <stop offset="1" stop-color="#00be20" />
+    </linearGradient>
+    <path
+      d="M32 10.82c0 2.21-1.49 4.65-5.41 4.65-3.42 0-7.27-2.37-10.59-4.65 3.52-2.43 7.39-5.63 10.59-5.63C29.86 5.18 32 8.17 32 10.82z"
+      fill="url(#StripeClimate-gradient-b)"
+    />
+    <linearGradient
+      id="StripeClimate-gradient-c"
+      gradientUnits="userSpaceOnUse"
+      x1="8"
+      y1="16.7494"
+      x2="8"
+      y2="29.1239"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset="0" stop-color="#ffe37d" />
+      <stop offset="1" stop-color="#ffc900" />
+    </linearGradient>
+    <path
+      d="M0 10.82c0 2.21 1.49 4.65 5.41 4.65 3.42 0 7.27-2.37 10.59-4.65-3.52-2.43-7.39-5.64-10.59-5.64C2.14 5.18 0 8.17 0 10.82z"
+      fill="url(#StripeClimate-gradient-c)"
+    />
+  </Icon>
+)
--- a/apps/builder/components/shared/ChangePlanForm/ChangePlanForm.tsx
+++ b/apps/builder/components/shared/ChangePlanForm/ChangePlanForm.tsx
@@ -1,4 +1,5 @@
 import { Stack, HStack, Text } from '@chakra-ui/react'
+import { StripeClimateLogo } from 'assets/logos/StripeClimateLogo'
 import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
 import { useUser } from 'contexts/UserContext'
 import { useWorkspace } from 'contexts/WorkspaceContext'
@@ -63,7 +64,21 @@ export const ChangePlanForm = () => {
  }

  return (
-    <Stack spacing={4}>
+    <Stack spacing={6}>
+      <HStack maxW="500px">
+        <StripeClimateLogo />
+        <Text fontSize="xs" color="gray.500">
+          Typebot is contributing 1% of your subscription to remove CO₂ from the
+          atmosphere.{' '}
+          <NextChakraLink
+            href="https://climate.stripe.com/5VCRAq"
+            isExternal
+            textDecor="underline"
+          >
+            More info.
+          </NextChakraLink>
+        </Text>
+      </HStack>
      <HStack alignItems="stretch" spacing="4" w="full">
        <StarterPlanContent
          initialChatsLimitIndex={
@@ -94,9 +109,8 @@ export const ChangePlanForm = () => {
          isExternal
          textDecor="underline"
        >
-          Let me know
+          Let's chat!
        </NextChakraLink>
-        .
      </Text>
    </Stack>
  )
--- a/apps/builder/pages/api/typebots/[typebotId].ts
+++ b/apps/builder/pages/api/typebots/[typebotId].ts
@@ -38,6 +38,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
    const typebots = await prisma.typebot.deleteMany({
      where: canWriteTypebot(typebotId, user),
    })
+    await prisma.result.updateMany({
+      where: { typebot: canWriteTypebot(typebotId, user) },
+      data: { isArchived: true },
+    })
    return res.send({ typebots })
  }
  if (req.method === 'PUT') {
--- a/apps/builder/pages/api/workspaces/[workspaceId].ts
+++ b/apps/builder/pages/api/workspaces/[workspaceId].ts
@@ -30,6 +30,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
        members: { some: { userId: user.id, role: WorkspaceRole.ADMIN } },
      },
    })
+    await prisma.result.updateMany({
+      where: {
+        typebot: {
+          workspace: {
+            id,
+            members: { some: { userId: user.id, role: WorkspaceRole.ADMIN } },
+          },
+        },
+      },
+      data: { isArchived: true },
+    })
    return res.status(200).json({
      message: 'success',
    })
--- a/apps/landing-page/assets/logos/StripeClimateLogo.tsx
+++ b/apps/landing-page/assets/logos/StripeClimateLogo.tsx
@@ -0,0 +1,61 @@
+import { Icon, IconProps } from '@chakra-ui/react'
+
+export const StripeClimateLogo = (props: IconProps) => (
+  <Icon
+    width="24px"
+    height="24px"
+    viewBox="0 0 32 32"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <linearGradient
+      id="StripeClimate-gradient-a"
+      gradientUnits="userSpaceOnUse"
+      x1="16"
+      y1="20.6293"
+      x2="16"
+      y2="7.8394"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset="0" stop-color="#00d924" />
+      <stop offset="1" stop-color="#00cb1b" />
+    </linearGradient>
+    <path
+      d="M0 10.82h32c0 8.84-7.16 16-16 16s-16-7.16-16-16z"
+      fill="url(#StripeClimate-gradient-a)"
+    />
+    <linearGradient
+      id="StripeClimate-gradient-b"
+      gradientUnits="userSpaceOnUse"
+      x1="24"
+      y1="28.6289"
+      x2="24"
+      y2="17.2443"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset=".1562" stop-color="#009c00" />
+      <stop offset="1" stop-color="#00be20" />
+    </linearGradient>
+    <path
+      d="M32 10.82c0 2.21-1.49 4.65-5.41 4.65-3.42 0-7.27-2.37-10.59-4.65 3.52-2.43 7.39-5.63 10.59-5.63C29.86 5.18 32 8.17 32 10.82z"
+      fill="url(#StripeClimate-gradient-b)"
+    />
+    <linearGradient
+      id="StripeClimate-gradient-c"
+      gradientUnits="userSpaceOnUse"
+      x1="8"
+      y1="16.7494"
+      x2="8"
+      y2="29.1239"
+      gradientTransform="matrix(1 0 0 -1 0 34)"
+    >
+      <stop offset="0" stop-color="#ffe37d" />
+      <stop offset="1" stop-color="#ffc900" />
+    </linearGradient>
+    <path
+      d="M0 10.82c0 2.21 1.49 4.65 5.41 4.65 3.42 0 7.27-2.37 10.59-4.65-3.52-2.43-7.39-5.64-10.59-5.64C2.14 5.18 0 8.17 0 10.82z"
+      fill="url(#StripeClimate-gradient-c)"
+    />
+  </Icon>
+)
--- a/apps/landing-page/pages/pricing.tsx
+++ b/apps/landing-page/pages/pricing.tsx
@@ -13,6 +13,7 @@ import {
  Text,
  chakra,
  Tooltip,
+  HStack,
 } from '@chakra-ui/react'
 import { HelpCircleIcon } from 'assets/icons/HelpCircleIcon'
 import { Footer } from 'components/common/Footer'
@@ -26,6 +27,7 @@ import { ActionButton } from 'components/PricingPage/PricingCard/ActionButton'
 import { useEffect, useState } from 'react'
 import { formatPrice, prices } from 'utils'
 import { Plan } from 'db'
+import { StripeClimateLogo } from 'assets/logos/StripeClimateLogo'

 const Pricing = () => {
  const [starterPrice, setStarterPrice] = useState('$39')
@@ -54,7 +56,8 @@ const Pricing = () => {
        </DarkMode>

        <VStack spacing={'24'} mt={[20, 32]} w="full">
-          <Stack align="center" spacing="6">
+          <Stack align="center" spacing="12" w="full">
+            <VStack>
              <Heading fontSize="6xl">Plans fit for you</Heading>
              <Text maxW="900px" fontSize="xl" textAlign="center">
                Whether you're a{' '}
@@ -68,8 +71,28 @@ const Pricing = () => {
                , Typebot is here to help you build high-performing bots for the
                right price. Pay for as little or as much usage as you need.
              </Text>
-          </Stack>
+            </VStack>

+            <HStack
+              maxW="500px"
+              spacing="4"
+              bgColor="gray.800"
+              p="4"
+              rounded="md"
+            >
+              <StripeClimateLogo />
+              <Text fontSize="sm">
+                Typebot is contributing 1% of your subscription to remove CO₂
+                from the atmosphere.{' '}
+                <NextChakraLink
+                  href="https://climate.stripe.com/5VCRAq"
+                  isExternal
+                  textDecor="underline"
+                >
+                  More info.
+                </NextChakraLink>
+              </Text>
+            </HStack>
            <Stack
              direction={['column', 'row']}
              alignItems={['stretch']}
@@ -172,7 +195,9 @@ const Pricing = () => {
                    </Text>,
                    <>
                      <Text>
-                      <chakra.span fontWeight="bold">10,000 chats</chakra.span>{' '}
+                        <chakra.span fontWeight="bold">
+                          10,000 chats
+                        </chakra.span>{' '}
                        included
                      </Text>
                      &nbsp;
@@ -221,6 +246,18 @@ const Pricing = () => {
                }
              />
            </Stack>
+            <Text fontSize="lg">
+              Need custom limits? Specific features?{' '}
+              <NextChakraLink
+                href={'https://typebot.io/enterprise-lead-form'}
+                isExternal
+                textDecor="underline"
+              >
+                Let's chat!
+              </NextChakraLink>
+            </Text>
+          </Stack>
+
          <VStack maxW="1200px" w="full" spacing={[12, 20]} px="4">
            <Stack w="full" spacing={10} display={['none', 'flex']}>
              <Heading>Compare plans & features</Heading>
@@ -244,6 +281,38 @@ const Pricing = () => {
 const Faq = () => {
  return (
    <Accordion w="full" allowToggle defaultIndex={0}>
+      <AccordionItem>
+        <Heading as="h2">
+          <AccordionButton py="6">
+            <Box flex="1" textAlign="left" fontSize="2xl">
+              What happens once I reach the monthly chats limit?
+            </Box>
+            <AccordionIcon />
+          </AccordionButton>
+        </Heading>
+        <AccordionPanel pb={4}>
+          You will receive an email notification once you reached 80% of this
+          limit. Then, once you reach 100%, the bot will be closed to new users.
+          Upgrading your limit will automatically reopen the bot.
+        </AccordionPanel>
+      </AccordionItem>
+      <AccordionItem>
+        <Heading as="h2">
+          <AccordionButton py="6">
+            <Box flex="1" textAlign="left" fontSize="2xl">
+              What happens once I reach the storage limit?
+            </Box>
+            <AccordionIcon />
+          </AccordionButton>
+        </Heading>
+        <AccordionPanel pb={4}>
+          You will receive an email notification once you reached 80% of this
+          limit. Then, once you reach 100%, your users will still be able to
+          chat with your bot but their uploads won't be stored anymore. You will
+          need to upgrade the limit or free up some space to continue collecting
+          your users' files.
+        </AccordionPanel>
+      </AccordionItem>
      <AccordionItem>
        <Heading as="h2">
          <AccordionButton py="6">
--- a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts
+++ b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/storage/upload-url.ts
@@ -76,7 +76,6 @@ const checkStorageLimit = async (typebotId: string) => {
  })
  if (!typebot?.workspace) throw new Error('Workspace not found')
  const { workspace } = typebot
-  console.log(typebot.workspaceId)
  const {
    _sum: { storageUsed: totalStorageUsed },
  } = await prisma.answer.aggregate({
--- a/packages/bot-engine/src/components/ConversationContainer.tsx
+++ b/packages/bot-engine/src/components/ConversationContainer.tsx
@@ -4,14 +4,7 @@ import { ChatGroup } from './ChatGroup'
 import { useFrame } from 'react-frame-component'
 import { setCssVariablesValue } from '../services/theme'
 import { useAnswers } from '../contexts/AnswersContext'
-import {
-  Group,
-  Edge,
-  PublicTypebot,
-  Theme,
-  VariableWithValue,
-  Block,
-} from 'models'
+import { Group, Edge, PublicTypebot, Theme, VariableWithValue } from 'models'
 import { byId, isDefined, isInputBlock, isNotDefined } from 'utils'
 import { animateScroll as scroll } from 'react-scroll'
 import { LinkedTypebot, useTypebot } from 'contexts/TypebotContext'
@@ -80,7 +73,6 @@ export const ConversationContainer = ({
    }
    const nextGroup = currentTypebot.groups.find(byId(nextEdge.to.groupId))
    if (!nextGroup) return onCompleted()
-    console.log(nextGroup, nextEdge)
    const startBlockIndex = nextEdge.to.blockId
      ? nextGroup.blocks.findIndex(byId(nextEdge.to.blockId))
      : 0
--- a/packages/db/prisma/migrations/20220925181003_remove_cascade_delete_on_result/migration.sql
+++ b/packages/db/prisma/migrations/20220925181003_remove_cascade_delete_on_result/migration.sql
@@ -0,0 +1,5 @@
+-- DropForeignKey
+ALTER TABLE "Result" DROP CONSTRAINT "Result_typebotId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "Result" ADD CONSTRAINT "Result_typebotId_fkey" FOREIGN KEY ("typebotId") REFERENCES "Typebot"("id") ON DELETE NO ACTION ON UPDATE CASCADE;
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -212,7 +212,7 @@ model Result {
  isCompleted Boolean
  hasStarted  Boolean?
  isArchived  Boolean?
-  typebot     Typebot  @relation(fields: [typebotId], references: [id], onDelete: Cascade)
+  typebot     Typebot  @relation(fields: [typebotId], references: [id], onDelete: NoAction)
  answers     Answer[]
  logs        Log[]
 }
--- a/packages/scripts/index.ts
+++ b/packages/scripts/index.ts
@@ -13,10 +13,10 @@ const prisma = new PrismaClient()

 const main = async () => {
  await injectFakeResults(prisma)({
-    count: 150,
-    typebotId: 'cl89sq4vb030109laivd9ck97',
+    count: 200,
+    typebotId: 'cl8hl08xt009909l6pwqenf63',
    isChronological: false,
-    idPrefix: 'batch2',
+    fakeStorage: 3 * 1024 * 1024 * 1024,
  })
 }