♻️ Normalize data

apps/builder/pages/api/typebots.ts

@@ -1,8 +1,8 @@
-import { parseNewTypebot } from 'bot-engine'
-import { User } from 'db'
+import { Prisma, User } from 'db'
 import prisma from 'libs/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getSession } from 'next-auth/react'
+import { parseNewTypebot } from 'services/typebots'
 import { methodNotAllowed } from 'utils'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
@@ -26,7 +26,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     if (req.method === 'POST') {
       const data = JSON.parse(req.body)
       const typebot = await prisma.typebot.create({
-        data: parseNewTypebot({ ownerId: user.id, ...data }),
+        data: parseNewTypebot({
+          ownerId: user.id,
+          ...data,
+        }) as Prisma.TypebotUncheckedCreateInput,
       })
       return res.send(typebot)
     }

apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts

@@ -1,4 +1,4 @@
-import { PublicTypebot } from 'bot-engine'
+import { PublicTypebot } from 'models'
 import { User } from 'db'
 import prisma from 'libs/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
@@ -24,14 +24,14 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
 
     const answersCounts: { blockId: string; totalAnswers: number }[] =
       await Promise.all(
-        (typebot.publishedTypebot as PublicTypebot).blocks.map(
-          async (block) => {
-            const totalAnswers = await prisma.answer.count({
-              where: { blockId: block.id },
-            })
-            return { blockId: block.id, totalAnswers }
-          }
-        )
+        (
+          typebot.publishedTypebot as unknown as PublicTypebot
+        ).blocks.allIds.map(async (blockId) => {
+          const totalAnswers = await prisma.answer.count({
+            where: { blockId },
+          })
+          return { blockId, totalAnswers }
+        })
       )
     return res.status(200).send({ answersCounts })
   }

apps/builder/pages/api/typebots/[typebotId]/results/stats.ts

@@ -1,6 +1,6 @@
-import { Stats } from 'bot-engine'
 import { User } from 'db'
 import prisma from 'libs/prisma'
+import { Stats } from 'models'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getSession } from 'next-auth/react'
 import { methodNotAllowed } from 'utils'

apps/builder/pages/typebots/[id]/edit.tsx

@@ -3,7 +3,7 @@ import { Board } from 'components/board/Board'
 import { Seo } from 'components/Seo'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
 import { EditorContext } from 'contexts/EditorContext'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { useRouter } from 'next/router'
 import { KBarProvider } from 'kbar'
 import React from 'react'

apps/builder/pages/typebots/[id]/results.tsx

@@ -2,7 +2,7 @@ import { Flex } from '@chakra-ui/layout'
 import { ResultsContent } from 'layouts/results/ResultsContent'
 import { Seo } from 'components/Seo'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { useRouter } from 'next/router'
 import React from 'react'
 import { UserContext } from 'contexts/UserContext'

apps/builder/pages/typebots/[id]/results/analytics.tsx

@@ -2,7 +2,7 @@ import { Flex } from '@chakra-ui/layout'
 import { ResultsContent } from 'layouts/results/ResultsContent'
 import { Seo } from 'components/Seo'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { useRouter } from 'next/router'
 import React from 'react'
 import { UserContext } from 'contexts/UserContext'

apps/builder/pages/typebots/[id]/settings.tsx

@@ -2,7 +2,7 @@ import { Flex } from '@chakra-ui/layout'
 import { Seo } from 'components/Seo'
 import { SettingsContent } from 'components/settings/SettingsContent'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { UserContext } from 'contexts/UserContext'
 import { useRouter } from 'next/router'
 import React from 'react'

apps/builder/pages/typebots/[id]/share.tsx

@@ -2,7 +2,7 @@ import { Flex } from '@chakra-ui/layout'
 import { Seo } from 'components/Seo'
 import { ShareContent } from 'components/share/ShareContent'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { UserContext } from 'contexts/UserContext'
 import { useRouter } from 'next/router'
 import React from 'react'

apps/builder/pages/typebots/[id]/theme.tsx

@@ -2,7 +2,7 @@ import { Flex } from '@chakra-ui/layout'
 import { Seo } from 'components/Seo'
 import { TypebotHeader } from 'components/shared/TypebotHeader'
 import { ThemeContent } from 'components/theme/ThemeContent'
-import { TypebotContext } from 'contexts/TypebotContext'
+import { TypebotContext } from 'contexts/TypebotContext/TypebotContext'
 import { UserContext } from 'contexts/UserContext'
 import { useRouter } from 'next/router'
 import React from 'react'