🐛 (calCom) Don't delete session if chat reply has custom embed
Closes #1164
This commit is contained in:
@ -86,6 +86,9 @@ export const continueChat = publicProcedure
|
|||||||
logs,
|
logs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
const isPreview = isNotDefined(session.state.typebotsQueue[0].resultId)
|
const isPreview = isNotDefined(session.state.typebotsQueue[0].resultId)
|
||||||
|
@ -133,6 +133,9 @@ export const sendMessageV1 = publicProcedure
|
|||||||
logs: allLogs,
|
logs: allLogs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -187,6 +190,9 @@ export const sendMessageV1 = publicProcedure
|
|||||||
logs: allLogs,
|
logs: allLogs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -133,6 +133,9 @@ export const sendMessageV2 = publicProcedure
|
|||||||
logs: allLogs,
|
logs: allLogs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -186,6 +189,9 @@ export const sendMessageV2 = publicProcedure
|
|||||||
logs: allLogs,
|
logs: allLogs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -78,6 +78,9 @@ export const startChat = publicProcedure
|
|||||||
logs,
|
logs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -66,6 +66,9 @@ export const startChatPreview = publicProcedure
|
|||||||
logs,
|
logs,
|
||||||
clientSideActions,
|
clientSideActions,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble: messages.some(
|
||||||
|
(message) => message.type === 'custom-embed'
|
||||||
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -16,6 +16,7 @@ type Props = {
|
|||||||
clientSideActions: ContinueChatResponse['clientSideActions']
|
clientSideActions: ContinueChatResponse['clientSideActions']
|
||||||
visitedEdges: VisitedEdge[]
|
visitedEdges: VisitedEdge[]
|
||||||
forceCreateSession?: boolean
|
forceCreateSession?: boolean
|
||||||
|
hasCustomEmbedBubble?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const saveStateToDatabase = async ({
|
export const saveStateToDatabase = async ({
|
||||||
@ -25,12 +26,15 @@ export const saveStateToDatabase = async ({
|
|||||||
clientSideActions,
|
clientSideActions,
|
||||||
forceCreateSession,
|
forceCreateSession,
|
||||||
visitedEdges,
|
visitedEdges,
|
||||||
|
hasCustomEmbedBubble,
|
||||||
}: Props) => {
|
}: Props) => {
|
||||||
const containsSetVariableClientSideAction = clientSideActions?.some(
|
const containsSetVariableClientSideAction = clientSideActions?.some(
|
||||||
(action) => action.expectsDedicatedReply
|
(action) => action.expectsDedicatedReply
|
||||||
)
|
)
|
||||||
|
|
||||||
const isCompleted = Boolean(!input && !containsSetVariableClientSideAction)
|
const isCompleted = Boolean(
|
||||||
|
!input && !containsSetVariableClientSideAction && !hasCustomEmbedBubble
|
||||||
|
)
|
||||||
|
|
||||||
const resultId = state.typebotsQueue[0].resultId
|
const resultId = state.typebotsQueue[0].resultId
|
||||||
|
|
||||||
|
@ -21,10 +21,6 @@ export const CustomEmbedBubble = (props: Props) => {
|
|||||||
let containerRef: HTMLDivElement | undefined
|
let containerRef: HTMLDivElement | undefined
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
console.log(
|
|
||||||
props.content.initFunction.content,
|
|
||||||
props.content.initFunction.args
|
|
||||||
)
|
|
||||||
executeCode({
|
executeCode({
|
||||||
args: {
|
args: {
|
||||||
...props.content.initFunction.args,
|
...props.content.initFunction.args,
|
||||||
|
Reference in New Issue
Block a user