🐛 (sheets) Fix can't start bot when filter is undefined

baptisteArno · Mar 17, 2023 · be7c0fc · be7c0fc · vercel · Mar 17, 2023
1 parent f9964e3
commit be7c0fc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/...builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings.tsx b/...builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings.tsx
@@ -228,7 +228,7 @@ const ActionOptions = ({
     case GoogleSheetsAction.GET:
       return (
         <Stack>
-          {options.referenceCell ? (
+          {options.referenceCell && (
             <>
               <Text>Row to select</Text>
               <CellWithValueStack
@@ -237,12 +237,13 @@ const ActionOptions = ({
                 onItemChange={handleReferenceCellChange}
               />
             </>
-          ) : (
+          )}
+          {options.filter && (
             <>
               <Text>Filter</Text>
               <RowsFilterTableList
                 columns={sheet?.columns ?? []}
-                filter={options.filter}
+                filter={options.filter ?? {}}
                 onFilterChange={handleFilterChange}
               />
             </>

diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/googleSheets.spec.ts b/apps/builder/src/features/blocks/integrations/googleSheets/googleSheets.spec.ts
@@ -136,9 +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","John","Fred","Georges","Georges"] ["Last name","Smith","Smith"]`
-    )
+    ).toHaveText(`Your name is: Georges Smith`)
   })
 })
 

diff --git a/apps/viewer/src/features/blocks/integrations/googleSheets/getRow.ts b/apps/viewer/src/features/blocks/integrations/googleSheets/getRow.ts
@@ -43,7 +43,7 @@ export const getRow = async (
     const filteredRows = rows.filter((row) =>
       referenceCell
         ? row[referenceCell.column as string] === referenceCell.value
-        : matchFilter(row, filter)
+        : matchFilter(row, filter as NonNullable<typeof filter>)
     )
     if (filteredRows.length === 0) {
       log = {
@@ -104,7 +104,7 @@ export const getRow = async (
 
 const matchFilter = (
   row: GoogleSpreadsheetRow,
-  filter: GoogleSheetsGetOptions['filter']
+  filter: NonNullable<GoogleSheetsGetOptions['filter']>
 ) => {
   return filter.logicalOperator === LogicalOperator.AND
     ? filter.comparisons.every(

diff --git a/...src/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts b/...src/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts
@@ -75,7 +75,7 @@ const getRows = async (req: NextApiRequest, res: NextApiResponse) => {
     const filteredRows = rows.filter((row) =>
       referenceCell
         ? row[referenceCell.column as string] === referenceCell.value
-        : matchFilter(row, filter)
+        : matchFilter(row, filter as NonNullable<typeof filter>)
     )
     if (filteredRows.length === 0) {
       await saveErrorLog({
@@ -181,7 +181,7 @@ const updateRow = async (req: NextApiRequest, res: NextApiResponse) => {
 
 const matchFilter = (
   row: GoogleSpreadsheetRow,
-  filter: GoogleSheetsGetOptions['filter']
+  filter: NonNullable<GoogleSheetsGetOptions['filter']>
 ) => {
   return filter.logicalOperator === LogicalOperator.AND
     ? filter.comparisons.every(

diff --git a/packages/schemas/features/blocks/integrations/googleSheets/schemas.ts b/packages/schemas/features/blocks/integrations/googleSheets/schemas.ts
@@ -40,10 +40,12 @@ const googleSheetsGetOptionsSchema = googleSheetsOptionsBaseSchema.merge(
     action: z.enum([GoogleSheetsAction.GET]),
     // TODO: remove referenceCell once migrated to filtering
     referenceCell: cellSchema.optional(),
-    filter: z.object({
-      comparisons: z.array(rowsFilterComparisonSchema),
-      logicalOperator: z.nativeEnum(LogicalOperator),
-    }),
+    filter: z
+      .object({
+        comparisons: z.array(rowsFilterComparisonSchema),
+        logicalOperator: z.nativeEnum(LogicalOperator),
+      })
+      .optional(),
     cellsToExtract: z.array(extractingCellSchema),
   })
 )