🚸 (variables) Allow null values in variable list

apps/builder/src/features/billing/components/UsageProgressBars.tsx

@@ -13,7 +13,7 @@ import { Plan, Workspace } from '@typebot.io/prisma'
 import React from 'react'
 import { parseNumberWithCommas } from '@typebot.io/lib'
 import { getChatsLimit, getStorageLimit } from '@typebot.io/lib/pricing'
-import { trpc } from '@/lib/trpc'
+import { defaultQueryOptions, trpc } from '@/lib/trpc'
 import { storageToReadable } from '../helpers/storageToReadable'
 
 type Props = {
@@ -21,9 +21,12 @@ type Props = {
 }
 
 export const UsageProgressBars = ({ workspace }: Props) => {
-  const { data, isLoading } = trpc.billing.getUsage.useQuery({
+  const { data, isLoading } = trpc.billing.getUsage.useQuery(
-    workspaceId: workspace.id,
+    {
-  })
+      workspaceId: workspace.id,
+    },
+    defaultQueryOptions
+  )
   const totalChatsUsed = data?.totalChatsUsed ?? 0
   const totalStorageUsed = data?.totalStorageUsed ?? 0
 

apps/builder/src/features/blocks/integrations/googleSheets/googleSheets.spec.ts

@@ -136,7 +136,7 @@ test.describe.parallel('Google sheets integration', () => {
       .press('Enter')
     await expect(
       page.locator('typebot-standard').locator('text=Your name is:')
-    ).toHaveText(`Your name is: Georges Smith`)
+    ).toHaveText(`Your name is: Georges2 Smith2`)
   })
 })
 

apps/builder/src/features/customDomains/customDomains.spec.ts

@@ -38,7 +38,9 @@ test('should be able to connect custom domain', async ({ page }) => {
   await expect(page.locator('text=sub.yolozeeer.com')).toBeHidden()
   await page.click('button >> text=Add my domain')
   await page.click('[aria-label="Remove domain"]')
-  await expect(page.locator('[aria-label="Remove domain"]')).toBeHidden()
+  await expect(page.locator('[aria-label="Remove domain"]')).toBeHidden({
+    timeout: 10000,
+  })
 })
 
 test.describe('Starter workspace', () => {

apps/builder/src/features/dashboard/dashboard.spec.ts

@@ -34,7 +34,11 @@ test('folders navigation should work', async ({ page }) => {
 
 test('folders and typebots should be deletable', async ({ page }) => {
   await createFolders([{ name: 'Folder #1' }, { name: 'Folder #2' }])
-  await createTypebots([{ id: 'deletable-typebot', name: 'Typebot #1' }])
+  const tomorrow = new Date()
+  tomorrow.setDate(tomorrow.getDate() + 1)
+  await createTypebots([
+    { id: 'deletable-typebot', name: 'Typebot #1', createdAt: tomorrow },
+  ])
   await page.goto('/typebots')
   await page.click('button[aria-label="Show Folder #1 menu"]')
   await page.click('li:has-text("Folder #1") >> button:has-text("Delete")')

apps/builder/src/features/workspace/WorkspaceProvider.tsx

@@ -92,6 +92,7 @@ export const WorkspaceProvider = ({
     onError: (error) => showToast({ description: error.message }),
     onSuccess: async () => {
       trpcContext.workspace.listWorkspaces.invalidate()
+      setWorkspaceId(undefined)
     },
   })
 
@@ -154,7 +155,6 @@ export const WorkspaceProvider = ({
   const deleteCurrentWorkspace = async () => {
     if (!workspaceId || !workspaces || workspaces.length < 2) return
     await deleteWorkspaceMutation.mutateAsync({ workspaceId })
-    setWorkspaceId(workspaces[0].id)
   }
 
   const refreshWorkspace = () => {

apps/builder/src/lib/trpc.ts

@@ -2,6 +2,7 @@ import { httpBatchLink, loggerLink } from '@trpc/client'
 import { createTRPCNext } from '@trpc/next'
 import type { AppRouter } from '../helpers/server/routers/v1/trpcRouter'
 import superjson from 'superjson'
+import { env } from '@typebot.io/lib'
 
 const getBaseUrl = () =>
   typeof window !== 'undefined' ? '' : process.env.NEXTAUTH_URL
@@ -24,3 +25,7 @@ export const trpc = createTRPCNext<AppRouter>({
   },
   ssr: false,
 })
+
+export const defaultQueryOptions = {
+  refetchOnMount: env('E2E_TEST') === 'true',
+}

apps/docs/openapi/builder/_spec_.json

@@ -1471,7 +1471,8 @@
                                     {
                                       "type": "array",
                                       "items": {
-                                        "type": "string"
+                                        "type": "string",
+                                        "nullable": true
                                       }
                                     }
                                   ]

apps/docs/openapi/chat/_spec_.json

@@ -2535,7 +2535,8 @@
                                         {
                                           "type": "array",
                                           "items": {
-                                            "type": "string"
+                                            "type": "string",
+                                            "nullable": true
                                           }
                                         }
                                       ],
@@ -3811,7 +3812,8 @@
                                                             {
                                                               "type": "array",
                                                               "items": {
-                                                                "type": "string"
+                                                                "type": "string",
+                                                                "nullable": true
                                                               }
                                                             }
                                                           ],
@@ -3905,7 +3907,8 @@
                                                             {
                                                               "type": "array",
                                                               "items": {
-                                                                "type": "string"
+                                                                "type": "string",
+                                                                "nullable": true
                                                               }
                                                             }
                                                           ],

apps/viewer/src/features/blocks/inputs/buttons/injectVariableValuesInButtonsInputBlock.ts

@@ -19,7 +19,7 @@ export const injectVariableValuesInButtonsInputBlock =
       if (!variable || typeof variable.value === 'string') return block
       return {
         ...block,
-        items: variable.value.map((item, idx) => ({
+        items: variable.value.filter(isDefined).map((item, idx) => ({
           id: idx.toString(),
           type: ItemType.BUTTON,
           blockId: block.id,

apps/viewer/src/features/blocks/integrations/sendEmail/executeSendEmailBlock.tsx

@@ -9,10 +9,11 @@ import {
   SendEmailOptions,
   SessionState,
   SmtpCredentials,
+  Variable,
 } from '@typebot.io/schemas'
 import { createTransport } from 'nodemailer'
 import Mail from 'nodemailer/lib/mailer'
-import { byId, isEmpty, isNotDefined, omit } from '@typebot.io/lib'
+import { byId, isDefined, isEmpty, isNotDefined, omit } from '@typebot.io/lib'
 import { parseAnswers } from '@typebot.io/lib/results'
 import { decrypt } from '@typebot.io/lib/api'
 import { defaultFrom, defaultTransportOptions } from './constants'
@@ -51,8 +52,7 @@ export const executeSendEmailBlock = async (
       replyTo: options.replyTo
         ? parseVariables(variables)(options.replyTo)
         : undefined,
-      fileUrls:
+      fileUrls: getFileUrls(variables)(options.attachmentsVariableId),
-        variables.find(byId(options.attachmentsVariableId))?.value ?? undefined,
       isCustomBody: options.isCustomBody,
       isBodyCode: options.isBodyCode,
     })
@@ -238,3 +238,12 @@ const parseEmailRecipient = (
     email: recipient,
   }
 }
+
+const getFileUrls =
+  (variables: Variable[]) =>
+  (variableId: string | undefined): string | string[] | undefined => {
+    const fileUrls = variables.find(byId(variableId))?.value
+    if (!fileUrls) return
+    if (typeof fileUrls === 'string') return fileUrls
+    return fileUrls.filter(isDefined)
+  }

apps/viewer/src/features/blocks/integrations/webhook/parseSampleResult.ts

@@ -83,7 +83,7 @@ const parseResultSample = (
   headerCells: ResultHeaderCell[],
   variables: Variable[]
 ) =>
-  headerCells.reduce<Record<string, string | string[] | undefined>>(
+  headerCells.reduce<Record<string, string | (string | null)[] | undefined>>(
     (resultSample, cell) => {
       const inputBlock = inputBlocks.find((inputBlock) =>
         cell.blocks?.some((block) => block.id === inputBlock.id)

apps/viewer/src/features/blocks/logic/condition/executeCondition.ts

@@ -41,8 +41,8 @@ const executeComparison =
     if (isNotDefined(value)) return false
     switch (comparison.comparisonOperator) {
       case ComparisonOperators.CONTAINS: {
-        const contains = (a: string, b: string) => {
+        const contains = (a: string | null, b: string | null) => {
-          if (b === '') return false
+          if (b === '' || !b || !a) return false
           return a.toLowerCase().trim().includes(b.toLowerCase().trim())
         }
         return compare(contains, inputValue, value)
@@ -55,14 +55,20 @@ const executeComparison =
       }
       case ComparisonOperators.GREATER: {
         return compare(
-          (a, b) => parseFloat(a) > parseFloat(b),
+          (a, b) =>
+            isDefined(a) && isDefined(b)
+              ? parseFloat(a) > parseFloat(b)
+              : false,
           inputValue,
           value
         )
       }
       case ComparisonOperators.LESS: {
         return compare(
-          (a, b) => parseFloat(a) < parseFloat(b),
+          (a, b) =>
+            isDefined(a) && isDefined(b)
+              ? parseFloat(a) < parseFloat(b)
+              : false,
           inputValue,
           value
         )
@@ -74,10 +80,11 @@ const executeComparison =
   }
 
 const compare = (
-  func: (a: string, b: string) => boolean,
+  func: (a: string | null, b: string | null) => boolean,
-  a: string | string[],
+  a: Variable['value'],
-  b: string | string[]
+  b: Variable['value']
 ): boolean => {
+  if (!a || !b) return false
   if (typeof a === 'string') {
     if (typeof b === 'string') return func(a, b)
     return b.some((b) => func(a, b))

apps/viewer/src/features/variables/findUniqueVariableValue.ts

@@ -2,7 +2,7 @@ import { Variable } from '@typebot.io/schemas'
 
 export const findUniqueVariableValue =
   (variables: Variable[]) =>
-  (value: string | undefined): string | string[] | null => {
+  (value: string | undefined): Variable['value'] => {
     if (!value || !value.startsWith('{{') || !value.endsWith('}}')) return null
     const variableName = value.slice(2, -2)
     const variable = variables.find(

apps/viewer/src/features/variables/parseGuessedValueType.ts

@@ -2,7 +2,7 @@ import { Variable } from '@typebot.io/schemas'
 
 export const parseGuessedValueType = (
   value: Variable['value']
-): string | string[] | boolean | number | null | undefined => {
+): string | (string | null)[] | boolean | number | null | undefined => {
   if (value === null) return null
   if (value === undefined) return undefined
   if (typeof value !== 'string') return value

apps/viewer/src/features/variables/updateVariables.ts

@@ -30,7 +30,7 @@ const updateResultVariables =
     const serializedNewVariables = newVariables.map((variable) => ({
       ...variable,
       value: Array.isArray(variable.value)
-        ? variable.value.map(safeStringify).filter(isDefined)
+        ? variable.value.map(safeStringify)
         : safeStringify(variable.value),
     }))
 
@@ -62,7 +62,7 @@ const updateTypebotVariables =
     const serializedNewVariables = newVariables.map((variable) => ({
       ...variable,
       value: Array.isArray(variable.value)
-        ? variable.value.map(safeStringify).filter(isDefined)
+        ? variable.value.map(safeStringify)
         : safeStringify(variable.value),
     }))
 

packages/deprecated/bot-engine/src/features/variables/utils.ts

@@ -48,7 +48,7 @@ export const safeStringify = (val: unknown): string | null => {
 
 export const parseCorrectValueType = (
   value: Variable['value']
-): string | string[] | boolean | number | null | undefined => {
+): string | (string | null)[] | boolean | number | null | undefined => {
   if (value === null) return null
   if (value === undefined) return undefined
   if (Array.isArray(value)) return value

packages/schemas/features/chat.ts

@@ -6,7 +6,7 @@ import {
 } from './blocks'
 import { publicTypebotSchema } from './publicTypebot'
 import { logSchema, resultSchema } from './result'
-import { typebotSchema } from './typebot'
+import { listVariableValue, typebotSchema } from './typebot'
 import {
   textBubbleContentSchema,
   imageBubbleContentSchema,
@@ -123,7 +123,7 @@ const scriptToExecuteSchema = z.object({
         .string()
         .or(z.number())
         .or(z.boolean())
-        .or(z.array(z.string()))
+        .or(listVariableValue)
         .nullish(),
     })
   ),

packages/schemas/features/typebot/variable.ts

@@ -1,9 +1,11 @@
 import { z } from 'zod'
 
+export const listVariableValue = z.array(z.string().nullable())
+
 export const variableSchema = z.object({
   id: z.string(),
   name: z.string(),
-  value: z.string().or(z.array(z.string())).nullish(),
+  value: z.string().or(listVariableValue).nullish(),
 })
 
 /**
@@ -12,7 +14,7 @@ export const variableSchema = z.object({
 export const variableWithValueSchema = z.object({
   id: z.string(),
   name: z.string(),
-  value: z.string().or(z.array(z.string())),
+  value: z.string().or(listVariableValue),
 })
 
 /**