fix: 🐛 misc

- Collaboration / Invitation type change failed
- ChoiceForm items text align left
- Webhook fails when choosing GET only

apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationList.tsx

@@ -72,7 +72,11 @@ export const CollaborationList = () => {
   const handleChangeInvitationCollabType =
     (email: string) => async (type: CollaborationType) => {
       if (!typebot || !isOwner) return
-      const { error } = await updateInvitation(typebot?.id, email, { type })
+      const { error } = await updateInvitation(typebot?.id, email, {
+        email,
+        typebotId: typebot.id,
+        type,
+      })
       if (error) return toast({ title: error.name, description: error.message })
       mutateInvitations({
         invitations: (invitations ?? []).map((i) =>
@@ -92,7 +96,11 @@ export const CollaborationList = () => {
   const handleChangeCollaborationType =
     (userId: string) => async (type: CollaborationType) => {
       if (!typebot || !isOwner) return
-      const { error } = await updateCollaborator(typebot?.id, userId, { type })
+      const { error } = await updateCollaborator(typebot?.id, userId, {
+        userId,
+        type,
+        typebotId: typebot.id,
+      })
       if (error) return toast({ title: error.name, description: error.message })
       mutateCollaborators({
         collaborators: (collaborators ?? []).map((c) =>

apps/builder/services/typebots/collaborators.ts

@@ -33,12 +33,12 @@ export const useCollaborators = ({
 export const updateCollaborator = (
   typebotId: string,
   userId: string,
-  updates: Partial<CollaboratorsOnTypebots>
+  collaborator: CollaboratorsOnTypebots
 ) =>
   sendRequest({
     method: 'PUT',
     url: `/api/typebots/${typebotId}/collaborators/${userId}`,
-    body: updates,
+    body: collaborator,
   })
 
 export const deleteCollaborator = (typebotId: string, userId: string) =>

apps/builder/services/typebots/invitations.ts

@@ -35,17 +35,17 @@ export const sendInvitation = (
 
 export const updateInvitation = (
   typebotId: string,
-  userId: string,
+  email: string,
-  updates: Partial<Invitation>
+  invitation: Omit<Invitation, 'createdAt'>
 ) =>
   sendRequest({
     method: 'PUT',
-    url: `/api/typebots/${typebotId}/invitations/${userId}`,
+    url: `/api/typebots/${typebotId}/invitations/${email}`,
-    body: updates,
+    body: invitation,
   })
 
-export const deleteInvitation = (typebotId: string, userId: string) =>
+export const deleteInvitation = (typebotId: string, email: string) =>
   sendRequest({
     method: 'DELETE',
-    url: `/api/typebots/${typebotId}/invitations/${userId}`,
+    url: `/api/typebots/${typebotId}/invitations/${email}`,
   })

apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts

@@ -1,6 +1,7 @@
 import prisma from 'libs/prisma'
 import {
   defaultWebhookAttributes,
+  HttpMethod,
   KeyValue,
   PublicTypebot,
   ResultValues,
@@ -105,11 +106,14 @@ const executeWebhook =
       convertKeyValueTableToObject(webhook.queryParams, variables)
     )
     const contentType = headers ? headers['Content-Type'] : undefined
-    const body = getBodyContent(typebot)({
+    const body =
-      body: webhook.body,
+      webhook.method !== HttpMethod.GET
-      resultValues,
+        ? getBodyContent(typebot)({
-      blockId,
+            body: webhook.body,
-    })
+            resultValues,
+            blockId,
+          })
+        : undefined
     try {
       const response = await got(
         parseVariables(variables)(

packages/bot-engine/src/components/ChatBlock/ChatStep/inputs/ChoiceForm.tsx

@@ -42,7 +42,7 @@ export const ChoiceForm = ({ step, onSubmit }: ChoiceFormProps) => {
             role={step.options?.isMultipleChoice ? 'checkbox' : 'button'}
             onClick={handleClick(idx)}
             className={
-              'py-2 px-4 font-semibold rounded-md transition-all filter hover:brightness-90 active:brightness-75 duration-100 focus:outline-none mr-2 mb-2 typebot-button ' +
+              'py-2 px-4 text-left font-semibold rounded-md transition-all filter hover:brightness-90 active:brightness-75 duration-100 focus:outline-none mr-2 mb-2 typebot-button ' +
               (selectedIndices.includes(idx) || !step.options?.isMultipleChoice
                 ? ''
                 : 'selectable')