fix: 🐛 Tiny bugs (Sentry)

.gitignore

@@ -16,6 +16,7 @@ test-results
 .docusaurus
 .cache-loader
 build
+firebaseServiceAccount.json
 
 # Wordpress
 .svn

apps/builder/components/shared/CredentialsDropdown.tsx

@@ -83,15 +83,17 @@ export const CredentialsDropdown = ({
       router.push(router.asPath.split('?')[0], undefined, { shallow: true })
   }
 
-  const handleDeleteDomainClick = (credentialsId: string) => async () => {
+  const handleDeleteDomainClick =
-    if (!user?.id) return
+    (credentialsId: string) => async (e: React.MouseEvent) => {
-    setIsDeleting(credentialsId)
+      e.stopPropagation()
-    const { error } = await deleteCredentials(user?.id, credentialsId)
+      if (!user?.id) return
-    setIsDeleting(undefined)
+      setIsDeleting(credentialsId)
-    if (error) return toast({ title: error.name, description: error.message })
+      const { error } = await deleteCredentials(user?.id, credentialsId)
-    onCredentialsSelect(undefined)
+      setIsDeleting(undefined)
-    mutate({ credentials: credentials.filter((c) => c.id !== credentialsId) })
+      if (error) return toast({ title: error.name, description: error.message })
-  }
+      onCredentialsSelect(undefined)
+      mutate({ credentials: credentials.filter((c) => c.id !== credentialsId) })
+    }
 
   return (
     <Menu isLazy placement="bottom-end" matchWidth>
@@ -121,7 +123,7 @@ export const CredentialsDropdown = ({
             </MenuItem>
           )}
           {credentialsList.map((credentials) => (
-            <Button
+            <MenuItem
               role="menuitem"
               minH="40px"
               key={credentials.id}
@@ -129,8 +131,6 @@ export const CredentialsDropdown = ({
               fontSize="16px"
               fontWeight="normal"
               rounded="none"
-              colorScheme="gray"
-              variant="ghost"
               justifyContent="space-between"
             >
               {credentials.name}
@@ -141,7 +141,7 @@ export const CredentialsDropdown = ({
                 onClick={handleDeleteDomainClick(credentials.id)}
                 isLoading={isDeleting === credentials.id}
               />
-            </Button>
+            </MenuItem>
           ))}
           <MenuItem
             maxW="500px"

apps/builder/contexts/TypebotContext/actions/edges.ts

@@ -89,6 +89,7 @@ export const deleteEdgeDraft = (
   edgeId: string
 ) => {
   const edgeIndex = typebot.edges.findIndex(byId(edgeId))
+  if (edgeIndex === -1) return
   deleteOutgoingEdgeIdProps(typebot, edgeIndex)
   typebot.edges.splice(edgeIndex, 1)
 }

apps/builder/pages/api/integrations/google-sheets/spreadsheets.ts

@@ -16,14 +16,14 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'GET') {
     const credentialsId = req.query.credentialsId.toString()
     const auth = await getAuthenticatedGoogleClient(user.id, credentialsId)
-    const { data } = await drive({
+    const response = await drive({
       version: 'v3',
       auth,
     }).files.list({
       q: "mimeType='application/vnd.google-apps.spreadsheet'",
       fields: 'nextPageToken, files(id, name)',
     })
-    return res.send(data)
+    return res.send(response.data)
   }
   return methodNotAllowed(res)
 }

apps/viewer/layouts/TypebotPage.tsx

@@ -31,7 +31,7 @@ export const TypebotPage = ({
   }, [])
 
   const initializeResult = async (variables: VariableWithValue[]) => {
-    const resultIdFromSession = sessionStorage.getItem(sessionStorageKey)
+    const resultIdFromSession = getExistingResultFromSession()
     if (resultIdFromSession) setResultId(resultIdFromSession)
     else {
       const { error, data: result } = await createResult(
@@ -41,7 +41,7 @@ export const TypebotPage = ({
       if (error) setError(error)
       if (result) {
         setResultId(result.id)
-        sessionStorage.setItem(sessionStorageKey, result.id)
+        setResultInSession(result.id)
       }
     }
   }
@@ -79,3 +79,15 @@ export const TypebotPage = ({
     </div>
   )
 }
+
+const getExistingResultFromSession = () => {
+  try {
+    return sessionStorage.getItem(sessionStorageKey)
+  } catch {}
+}
+
+const setResultInSession = (resultId: string) => {
+  try {
+    return sessionStorage.setItem(sessionStorageKey, resultId)
+  } catch {}
+}

apps/viewer/pages/api/integrations/google-sheets/spreadsheets/[spreadsheetId]/sheets/[sheetId].ts

@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import { initMiddleware, methodNotAllowed } from 'utils'
+import { badRequest, initMiddleware, methodNotAllowed } from 'utils'
 import { GoogleSpreadsheet } from 'google-spreadsheet'
 import { getAuthenticatedGoogleClient } from 'libs/google-sheets'
 import { Cell } from 'models'
@@ -17,7 +17,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       column: req.query['referenceCell[column]'],
       value: req.query['referenceCell[value]'],
     } as Cell
-    const extractingColumns = req.query.columns as string[]
+    const extractingColumns = req.query.columns as string[] | undefined
+    if (!Array.isArray(extractingColumns)) return badRequest(res)
     const doc = new GoogleSpreadsheet(spreadsheetId)
     doc.useOAuth2Client(await getAuthenticatedGoogleClient(credentialsId))
     await doc.loadInfo()

packages/scripts/index.ts

@@ -1,5 +1,4 @@
 import { PrismaClient } from 'db'
-import { randomUUID } from 'crypto'
 import path from 'path'
 
 require('dotenv').config({
@@ -10,11 +9,6 @@ require('dotenv').config({
 })
 
 const prisma = new PrismaClient()
-const main = async () => {
+const main = async () => {}
-  await prisma.user.updateMany({
-    where: { apiToken: null },
-    data: { apiToken: randomUUID() },
-  })
-}
 
 main().then()

packages/scripts/package.json

@@ -11,5 +11,8 @@
   "devDependencies": {
     "db": "*",
     "ts-node": "^10.5.0"
+  },
+  "dependencies": {
+    "firebase-admin": "^10.0.2"
   }
 }