refactor(models): 🎨 Build types from validation schemas

apps/builder/contexts/WorkspaceContext.tsx

@@ -5,7 +5,7 @@ import {
   useEffect,
   useState,
 } from 'react'
-import { byId, isNotEmpty } from 'utils'
+import { byId } from 'utils'
 import { MemberInWorkspace, Plan, Workspace, WorkspaceRole } from 'db'
 import {
   createNewWorkspace,
@@ -87,8 +87,11 @@ export const WorkspaceContext = ({ children }: { children: ReactNode }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [typebot?.workspaceId])
 
-  const switchWorkspace = (workspaceId: string) =>
-    setCurrentWorkspace(workspaces?.find(byId(workspaceId)))
+  const switchWorkspace = (workspaceId: string) => {
+    const newWorkspace = workspaces?.find(byId(workspaceId))
+    if (!newWorkspace) return
+    setCurrentWorkspace(newWorkspace)
+  }
 
   const createWorkspace = async (name?: string) => {
     if (!workspaces) return

apps/builder/layouts/results/ResultsContent.tsx

@@ -70,11 +70,13 @@ export const ResultsContent = () => {
         </HStack>
       </Flex>
       <Flex pt={['10px', '60px']} w="full" justify="center">
-        {publishedTypebot &&
+        {workspace &&
+          publishedTypebot &&
           (isAnalytics ? (
             <AnalyticsContent stats={stats} />
           ) : (
             <SubmissionsContent
+              workspaceId={workspace.id}
               typebotId={publishedTypebot.typebotId}
               onDeleteResults={handleDeletedResults}
               totalResults={stats?.totalStarts ?? 0}

apps/builder/layouts/results/SubmissionContent.tsx

@@ -18,12 +18,14 @@ import { Plan } from 'db'
 import { useToast } from 'components/shared/hooks/useToast'
 
 type Props = {
+  workspaceId: string
   typebotId: string
   totalResults: number
   totalHiddenResults?: number
   onDeleteResults: (total: number) => void
 }
 export const SubmissionsContent = ({
+  workspaceId,
   typebotId,
   totalResults,
   totalHiddenResults,
@@ -51,6 +53,7 @@ export const SubmissionsContent = ({
   const resultHeader = parseResultHeader(blocksAndVariables)
 
   const { data, mutate, setSize, hasMore } = useResults({
+    workspaceId,
     typebotId,
     onError: (err) => showToast({ title: err.name, description: err.message }),
   })
@@ -125,7 +128,7 @@ export const SubmissionsContent = ({
 
   const getAllTableData = async () => {
     if (!publishedTypebot) return []
-    const results = await getAllResults(typebotId)
+    const results = await getAllResults(workspaceId, typebotId)
     return convertResultsToTableData(results, resultHeader)
   }
 

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

@@ -4,13 +4,19 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { canReadTypebot, canWriteTypebot } from 'services/api/dbRules'
 import { getAuthenticatedUser } from 'services/api/utils'
 import { isFreePlan } from 'services/workspace'
-import { forbidden, methodNotAllowed, notAuthenticated } from 'utils'
+import {
+  badRequest,
+  forbidden,
+  methodNotAllowed,
+  notAuthenticated,
+} from 'utils'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
   if (!user) return notAuthenticated(res)
   const workspaceId = req.query.workspaceId as string | undefined
   if (req.method === 'GET') {
+    if (!workspaceId) return badRequest(res, 'workspaceId is required')
     const workspace = await prisma.workspace.findFirst({
       where: { id: workspaceId, members: { some: { userId: user.id } } },
       select: { plan: true },

apps/builder/playwright/tests/editor.spec.ts

@@ -143,12 +143,13 @@ test.describe.parallel('Editor', () => {
     await page.goto(`/typebots/${typebotId}/edit`)
 
     await page.click('[data-testid="editable-icon"]')
+    await expect(page.locator('text="My awesome typebot"')).toBeVisible()
     await page.fill('input[placeholder="Search..."]', 'love')
     await page.click('text="😍"')
     await page.click('text="My awesome typebot"')
     await page.fill('input[value="My awesome typebot"]', 'My superb typebot')
     await page.press('input[value="My superb typebot"]', 'Enter')
-    await page.goto(`/typebots`)
+    await page.click('[aria-label="Navigate back"]')
     await expect(page.locator('text="😍"')).toBeVisible()
     await expect(page.locator('text="My superb typebot"')).toBeVisible()
   })

apps/builder/playwright/tests/settings.spec.ts

@@ -78,6 +78,7 @@ test.describe.parallel('Settings page', () => {
       )
       await page.goto(`/typebots/${typebotId}/settings`)
       await page.click('button:has-text("Metadata")')
+      await page.waitForTimeout(1000)
 
       // Fav icon
       const favIconImg = page.locator('img >> nth=0')

apps/builder/services/typebots/results.tsx

@@ -2,7 +2,7 @@ import { ResultWithAnswers, VariableWithValue, ResultHeaderCell } from 'models'
 import useSWRInfinite from 'swr/infinite'
 import { stringify } from 'qs'
 import { Answer } from 'db'
-import { isDefined, sendRequest } from 'utils'
+import { isDefined, isEmpty, sendRequest } from 'utils'
 import { fetcher } from 'services/utils'
 import { HStack, Text } from '@chakra-ui/react'
 import { CodeIcon, CalendarIcon } from 'assets/icons'
@@ -11,23 +11,27 @@ import { StepIcon } from 'components/editor/StepsSideBar/StepIcon'
 const paginationLimit = 50
 
 const getKey = (
+  workspaceId: string,
   typebotId: string,
   pageIndex: number,
   previousPageData: {
     results: ResultWithAnswers[]
   }
 ) => {
   if (previousPageData && previousPageData.results.length === 0) return null
-  if (pageIndex === 0) return `/api/typebots/${typebotId}/results?limit=50`
+  if (pageIndex === 0)
+    return `/api/typebots/${typebotId}/results?limit=50&workspaceId=${workspaceId}`
   return `/api/typebots/${typebotId}/results?lastResultId=${
     previousPageData.results[previousPageData.results.length - 1].id
-  }&limit=${paginationLimit}`
+  }&limit=${paginationLimit}&workspaceId=${workspaceId}`
 }
 
 export const useResults = ({
+  workspaceId,
   typebotId,
   onError,
 }: {
+  workspaceId: string
   typebotId: string
   onError: (error: Error) => void
 }) => {
@@ -40,9 +44,14 @@ export const useResults = ({
       previousPageData: {
         results: ResultWithAnswers[]
       }
-    ) => getKey(typebotId, pageIndex, previousPageData),
+    ) => getKey(workspaceId, typebotId, pageIndex, previousPageData),
     fetcher,
-    { revalidateAll: true }
+    {
+      revalidateAll: true,
+      dedupingInterval: isEmpty(process.env.NEXT_PUBLIC_E2E_TEST)
+        ? undefined
+        : 0,
+    }
   )
 
   if (error) onError(error)
@@ -80,12 +89,12 @@ export const deleteAllResults = async (typebotId: string) =>
     method: 'DELETE',
   })
 
-export const getAllResults = async (typebotId: string) => {
+export const getAllResults = async (workspaceId: string, typebotId: string) => {
   const results = []
   let hasMore = true
   let lastResultId: string | undefined = undefined
   do {
-    const query = stringify({ limit: 200, lastResultId })
+    const query = stringify({ limit: 200, lastResultId, workspaceId })
     const { data } = await sendRequest<{ results: ResultWithAnswers[] }>({
       url: `/api/typebots/${typebotId}/results?${query}`,
       method: 'GET',

packages/bot-engine/package.json

@@ -45,7 +45,10 @@
     "typescript": "^4.6.4"
   },
   "peerDependencies": {
-    "react": "^18.1.0"
+    "react": "^18.1.0",
+    "utils": "*",
+    "db": "*",
+    "models": "*"
   },
   "scripts": {
     "build": "yarn rollup -c",

packages/db/prisma/migrations/20220607063609_required_workspace/migration.sql

@@ -0,0 +1,20 @@
+/*
+  Warnings:
+
+  - Made the column `workspaceId` on table `Credentials` required. This step will fail if there are existing NULL values in that column.
+  - Made the column `workspaceId` on table `CustomDomain` required. This step will fail if there are existing NULL values in that column.
+  - Made the column `workspaceId` on table `DashboardFolder` required. This step will fail if there are existing NULL values in that column.
+  - Made the column `workspaceId` on table `Typebot` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "Credentials" ALTER COLUMN "workspaceId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "CustomDomain" ALTER COLUMN "workspaceId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "DashboardFolder" ALTER COLUMN "workspaceId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Typebot" ALTER COLUMN "workspaceId" SET NOT NULL;

packages/db/prisma/schema.prisma

@@ -114,15 +114,15 @@ enum GraphNavigation {
 model CustomDomain {
   name        String     @id
   createdAt   DateTime   @default(now())
-  workspaceId String?
-  workspace   Workspace? @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  workspaceId String
+  workspace   Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
 }
 
 model Credentials {
   id          String     @id @default(cuid())
   createdAt   DateTime   @default(now())
-  workspaceId String?
-  workspace   Workspace? @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  workspaceId String
+  workspace   Workspace @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
   data        String // Encrypted data
   name        String
   type        String
@@ -154,8 +154,8 @@ model DashboardFolder {
   parentFolder   DashboardFolder?  @relation("ParentChild", fields: [parentFolderId], references: [id])
   childrenFolder DashboardFolder[] @relation("ParentChild")
   typebots       Typebot[]
-  workspaceId    String?
-  workspace      Workspace?        @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  workspaceId    String
+  workspace      Workspace        @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
 }
 
 model Typebot {
@@ -179,8 +179,8 @@ model Typebot {
   collaborators      CollaboratorsOnTypebots[]
   invitations        Invitation[]
   webhooks           Webhook[]
-  workspaceId        String?
-  workspace          Workspace?                @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
+  workspaceId        String
+  workspace          Workspace               @relation(fields: [workspaceId], references: [id], onDelete: Cascade)
 }
 
 model Invitation {

packages/models/package.json

@@ -1,20 +1,31 @@
 {
   "name": "models",
   "version": "1.0.0",
-  "main": "dist/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/index.d.ts",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "devDependencies": {
-    "typescript": "^4.6.4"
+    "typescript": "^4.6.4",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-typescript": "^8.3.2",
+    "rollup": "^2.72.1",
+    "rollup-plugin-dts": "^4.2.1",
+    "rollup-plugin-peer-deps-external": "^2.2.4"
   },
   "dependencies": {
-    "next": "^12.1.6",
     "db": "*",
-    "@udecode/plate-core": "^11.0.0"
+    "next": "^12.1.6",
+    "zod": "^3.17.3"
+  },
+  "peerDependencies": {
+    "next": "^12.1.6",
+    "db": "*"
   },
   "scripts": {
-    "build": "tsc",
-    "dx": "tsc --watch --preserveWatchOutput"
+    "build": "yarn rollup -c",
+    "dx": "yarn rollup -c --watch"
   }
 }

packages/models/rollup.config.js

@@ -0,0 +1,38 @@
+import resolve from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
+import typescript from '@rollup/plugin-typescript'
+import dts from 'rollup-plugin-dts'
+import peerDepsExternal from 'rollup-plugin-peer-deps-external'
+
+const packageJson = require('./package.json')
+
+export default [
+  {
+    input: 'src/index.ts',
+    output: [
+      {
+        file: packageJson.main,
+        format: 'cjs',
+        sourcemap: true,
+        inlineDynamicImports: true,
+      },
+      {
+        file: packageJson.module,
+        format: 'esm',
+        sourcemap: true,
+        inlineDynamicImports: true,
+      },
+    ],
+    plugins: [
+      peerDepsExternal(),
+      resolve(),
+      commonjs(),
+      typescript({ tsconfig: './tsconfig.json' }),
+    ],
+  },
+  {
+    input: 'dist/esm/types/index.d.ts',
+    output: [{ file: 'dist/index.d.ts', format: 'esm' }],
+    plugins: [dts()],
+  },
+]

packages/models/src/result.ts

@@ -1,5 +1,6 @@
 import { Result as ResultFromPrisma } from 'db'
-import { Answer, InputStepType, VariableWithValue } from '.'
+import { Answer, VariableWithValue } from '.'
+import { InputStepType } from './typebot/steps/shared'
 
 export type Result = Omit<ResultFromPrisma, 'createdAt' | 'variables'> & {
   createdAt: string