blsmedia/bot
2
0
Fork 0
Code Activity

🐛 (preview) Fix always displayed start props toast

Browse Source
This commit is contained in:
Baptiste Arnaud
2023-09-27 15:40:57 +02:00
parent ccc34b3028
commit 99b0025a66
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/bot-engine/startSession.ts
View File

@@ -147,12 +147,12 @@ export const startSession = async ({
if (isDefined(startClientSideAction)) { if (isDefined(startClientSideAction)) {
if (!result) { if (!result) {
if ('startPropsToInject' in startClientSideAction) { if ('startPropsToInject' in startClientSideAction) {
const { customHeadCode, googleAnalyticsId, pixelId, gtmId } = const { customHeadCode, googleAnalyticsId, pixelId, pixelIds, gtmId } =
startClientSideAction.startPropsToInject startClientSideAction.startPropsToInject
let toolsList = '' let toolsList = ''
if (customHeadCode) toolsList += 'Custom head code, ' if (customHeadCode) toolsList += 'Custom head code, '
if (googleAnalyticsId) toolsList += 'Google Analytics, ' if (googleAnalyticsId) toolsList += 'Google Analytics, '
if (pixelId) toolsList += 'Pixel, ' if (pixelId || pixelIds) toolsList += 'Pixel, '
if (gtmId) toolsList += 'Google Tag Manager, ' if (gtmId) toolsList += 'Google Tag Manager, '
toolsList = toolsList.slice(0, -2) toolsList = toolsList.slice(0, -2)
startLogs.push({ startLogs.push({
@@ -321,6 +321,15 @@ const parseStartClientSideAction = (
typebot: StartTypebot typebot: StartTypebot
): NonNullable<ChatReply['clientSideActions']>[number] | undefined => { ): NonNullable<ChatReply['clientSideActions']>[number] | undefined => {
const blocks = typebot.groups.flatMap((group) => group.blocks) const blocks = typebot.groups.flatMap((group) => group.blocks)
const pixelBlocks = (
blocks.filter(
(block) =>
block.type === IntegrationBlockType.PIXEL &&
isNotEmpty(block.options.pixelId) &&
block.options.isInitSkip !== true
) as PixelBlock[]
).map((pixelBlock) => pixelBlock.options.pixelId as string)
const startPropsToInject = { const startPropsToInject = {
customHeadCode: isNotEmpty(typebot.settings.metadata.customHeadCode) customHeadCode: isNotEmpty(typebot.settings.metadata.customHeadCode)
? parseHeadCode(typebot.settings.metadata.customHeadCode) ? parseHeadCode(typebot.settings.metadata.customHeadCode)
@@ -333,14 +342,7 @@ const parseStartClientSideAction = (
block.options.trackingId block.options.trackingId
) as GoogleAnalyticsBlock | undefined ) as GoogleAnalyticsBlock | undefined
)?.options.trackingId, )?.options.trackingId,
pixelIds: ( pixelIds: pixelBlocks.length > 0 ? pixelBlocks : undefined,
blocks.filter(
(block) =>
block.type === IntegrationBlockType.PIXEL &&
isNotEmpty(block.options.pixelId) &&
block.options.isInitSkip !== true
) as PixelBlock[]
).map((pixelBlock) => pixelBlock.options.pixelId as string),
} }
if ( if (