blsmedia/bot
2
0
Fork 0
Code Activity

🐛 (webhook) Fix variable list parsing in custom body

Browse Source 
Closes #687
This commit is contained in:
Baptiste Arnaud
2023-08-18 15:57:52 +02:00
parent a4f7f8fae7
commit ed77f5d124
8 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/builder/src/features/blocks/integrations/webhook/components/WebhookAdvancedConfigForm.tsx
View File

@ -186,9 +186,7 @@ export const WebhookAdvancedConfigForm = ({
</AccordionButton>
<AccordionPanel pt="4">
<TableList<VariableForTest>
initialItems={
options?.variablesForTest ?? { byId: {}, allIds: [] }
}
initialItems={options?.variablesForTest ?? []}
onItemsChange={updateVariablesForTest}
Item={VariableForTestInputs}
addLabel="Add an entry"

16
apps/builder/src/features/blocks/integrations/webhook/helpers/convertVariablesForTestToVariables.ts
View File

@ -1,3 +1,5 @@
import { safeStringify } from '@typebot.io/lib/safeStringify'
import { isDefined } from '@typebot.io/lib/utils'
import { Variable, VariableForTest } from '@typebot.io/schemas'
export const convertVariablesForTestToVariables = (
@ -13,7 +15,19 @@ export const convertVariablesForTestToVariables = (
const variable = variables.find(
(v) => v.id === variableForTest.variableId
) as Variable
return { ...variable, value: variableForTest.value }
return { ...variable, value: parseVariableValue(variableForTest.value) }
}, {}),
]
}
const parseVariableValue = (value: string | undefined): string | string[] => {
if (!value) return ''
try {
const parsedValue = JSON.parse(value)
if (Array.isArray(parsedValue))
return parsedValue.map(safeStringify).filter(isDefined)
return safeStringify(parsedValue) ?? value
} catch (error) {
return value
}
}