@botonic/plugin-flow-builder 0.58.0-alpha.1 → 0.58.0-alpha.2

package/src/action/index.tsx

@@ -1,5 +1,6 @@
 import { type BotContext, isDev, isWebchat } from '@botonic/core'
 import {
+  CampaignMessageAttributesProvider,
   Multichannel,
   RequestContext,
   WebchatSettings,
@@ -21,6 +22,7 @@ import { getContents } from './get-contents'
 
 export type FlowBuilderActionProps = {
   contents: FlowContent[]
+  campaignFirstMessageId?: string
   webchatSettingsParams?: WebchatSettingsProps
 }
 
@@ -46,14 +48,20 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
     botContext: BotContext,
     contentID?: string
   ): Promise<FlowBuilderActionProps> {
-    const contents = await getContents(botContext, contentID)
+    const { contents, campaignFirstMessageId } = await getContents(
+      botContext,
+      contentID
+    )
 
     const contentsToRender = await FlowBuilderAction.prepareContentsToRender(
       botContext,
       contents
     )
 
-    return { contents: contentsToRender }
+    return {
+      contents: contentsToRender,
+      campaignFirstMessageId,
+    }
   }
 
   static async prepareContentsToRender(
@@ -137,7 +145,7 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
   }
 
   render(): JSX.Element | JSX.Element[] {
-    const { contents } = this.props
+    const { contents, campaignFirstMessageId } = this.props
     const botContext = this.context as BotContext
     const { shouldSendWebchatSettings, webchatSettingsParams } =
       this.getWebchatSettingsParams(botContext)
@@ -147,15 +155,37 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
         {shouldSendWebchatSettings && (
           <WebchatSettings {...webchatSettingsParams} />
         )}
-        {contents.map(content => content.toBotonic(botContext))}
+        {FlowBuilderAction.renderContents(
+          contents,
+          botContext,
+          campaignFirstMessageId
+        )}
       </>
     )
   }
+
+  protected static renderContents(
+    contents: FlowContent[],
+    botContext: BotContext,
+    campaignFirstMessageId?: string
+  ): JSX.Element | JSX.Element[] {
+    const rendered = contents.map(content => content.toBotonic(botContext))
+
+    if (!campaignFirstMessageId) {
+      return rendered
+    }
+
+    return (
+      <CampaignMessageAttributesProvider campaignId={campaignFirstMessageId}>
+        {rendered}
+      </CampaignMessageAttributesProvider>
+    )
+  }
 }
 
 export class FlowBuilderMultichannelAction extends FlowBuilderAction {
   render(): JSX.Element | JSX.Element[] {
-    const { contents } = this.props
+    const { contents, campaignFirstMessageId } = this.props
     const botContext = this.context as BotContext
     const { shouldSendWebchatSettings, webchatSettingsParams } =
       this.getWebchatSettingsParams(botContext)
@@ -165,7 +195,11 @@ export class FlowBuilderMultichannelAction extends FlowBuilderAction {
         {shouldSendWebchatSettings && (
           <WebchatSettings {...webchatSettingsParams} />
         )}
-        {contents.map(content => content.toBotonic(botContext))}
+        {FlowBuilderAction.renderContents(
+          contents,
+          botContext,
+          campaignFirstMessageId
+        )}
       </Multichannel>
     )
   }

package/src/action/payload.ts

@@ -1,25 +1,22 @@
 import { EventAction, type EventFeedback, storeCaseRating } from '@botonic/core'
 import { v7 as uuid } from 'uuid'
-
-import {
-  AGENT_RATING_PAYLOAD,
-  PUSH_FLOW_PAYLOAD,
-  SEPARATOR,
-} from '../constants'
-import type { FlowContent } from '../content-fields'
+import { AGENT_RATING_PAYLOAD, PUSH_FLOW_PAYLOAD } from '../constants'
 import type { HtNodeWithContent } from '../content-fields/hubtype-fields'
 import { trackEvent } from '../tracking'
+import type { FlowBuilderContentsResult } from './contents-result'
 import type { FlowBuilderContext } from './context'
+import { PushFlowResolver } from './push-flow-resolver'
 
 export async function getContentsByPayload(
   context: FlowBuilderContext
-): Promise<FlowContent[]> {
+): Promise<FlowBuilderContentsResult> {
   const { cmsApi, flowBuilderPlugin, request, contentID } = context
   if (request.input.payload?.startsWith(AGENT_RATING_PAYLOAD)) {
     return await resolveRatingPayload(context)
   }
   if (request.input.payload?.startsWith(PUSH_FLOW_PAYLOAD)) {
-    return await resolvePushFlowPayload(context)
+    const pushFlow = new PushFlowResolver(context)
+    return await pushFlow.getContents()
   }
 
   const id = contentID
@@ -28,19 +25,21 @@ export async function getContentsByPayload(
   const targetNode = id ? cmsApi.getNodeById<HtNodeWithContent>(id) : undefined
 
   if (targetNode) {
-    return await flowBuilderPlugin.getContentsByNode(targetNode)
+    return {
+      contents: await flowBuilderPlugin.getContentsByNode(targetNode),
+    }
   }
 
-  return []
+  return { contents: [] }
 }
 
 async function resolveRatingPayload(
   context: FlowBuilderContext
-): Promise<FlowContent[]> {
+): Promise<FlowBuilderContentsResult> {
   const { cmsApi, flowBuilderPlugin, request } = context
 
   if (!request.input.payload) {
-    return []
+    return { contents: [] }
   }
 
   const { target, text, value, possibleOptions, possibleValues } =
@@ -66,39 +65,10 @@ async function resolveRatingPayload(
     : undefined
 
   if (targetNode) {
-    return await flowBuilderPlugin.getContentsByNode(targetNode)
-  }
-
-  return []
-}
-
-async function resolvePushFlowPayload(
-  context: FlowBuilderContext
-): Promise<FlowContent[]> {
-  const { cmsApi, flowBuilderPlugin, request } = context
-
-  if (!request.input.payload) {
-    return []
-  }
-
-  const parts = request.input.payload.split(SEPARATOR)
-  const pushFlowId = parts.length > 1 ? parts[1] : ''
-
-  if (!pushFlowId) {
-    return []
-  }
-
-  try {
-    const pushFlowNode =
-      cmsApi.getNodeByCampaignId<HtNodeWithContent>(pushFlowId)
-
-    if (!pushFlowNode) {
-      return []
+    return {
+      contents: await flowBuilderPlugin.getContentsByNode(targetNode),
     }
-
-    return await flowBuilderPlugin.getContentsByNode(pushFlowNode)
-  } catch {
-    // Campaign not found - return empty to trigger fallback
-    return []
   }
+
+  return { contents: [] }
 }

package/src/action/push-flow-resolver.ts

@@ -0,0 +1,91 @@
+import {
+  type BotContext,
+  BotonicInputContextType,
+  getInputContextOfType,
+} from '@botonic/core'
+import type { FlowBuilderApi } from '../api'
+import type { HtNodeWithContent } from '../content-fields/hubtype-fields'
+import type BotonicPluginFlowBuilder from '../index'
+import type { FlowBuilderContentsResult } from './contents-result'
+import type { FlowBuilderContext } from './context'
+
+export enum PushFlowErrorCode {
+  NoCampaignContext = 'NoCampaignContext',
+  NoCampaignStartNode = 'NoCampaignStartNode',
+  NoCampaignFollowUpNode = 'NoCampaignFollowUpNode',
+}
+
+export class PushFlowError extends Error {
+  readonly code: PushFlowErrorCode
+
+  constructor(code: PushFlowErrorCode, reason: string) {
+    super(`push-flow failed: ${reason}`)
+    this.code = code
+    this.name = 'PushFlowError'
+  }
+}
+
+export class PushFlowResolver {
+  private botContext: BotContext
+  private cmsApi: FlowBuilderApi
+  private flowBuilderPlugin: BotonicPluginFlowBuilder
+
+  constructor(context: FlowBuilderContext) {
+    this.botContext = context.request
+    this.cmsApi = context.cmsApi
+    this.flowBuilderPlugin = context.flowBuilderPlugin
+  }
+
+  async getContents(): Promise<FlowBuilderContentsResult> {
+    const campaignContext = getInputContextOfType(
+      this.botContext.input.context,
+      BotonicInputContextType.PushFlow
+    )
+
+    if (!campaignContext) {
+      throw new PushFlowError(
+        PushFlowErrorCode.NoCampaignContext,
+        'No campaign context found in input context'
+      )
+    }
+
+    const {
+      campaign_id: campaignId,
+      campaign_flow_id: campaignFlowId,
+      campaign_follow_up_id: campaignFollowUpId,
+    } = campaignContext
+
+    const campaignStartNode = this.getCampaignStartNode(campaignFlowId)
+    const followUpNode = campaignFollowUpId
+      ? this.cmsApi.getNodeById<HtNodeWithContent>(campaignFollowUpId)
+      : undefined
+
+    if (campaignFollowUpId && !followUpNode) {
+      throw new PushFlowError(
+        PushFlowErrorCode.NoCampaignFollowUpNode,
+        'No campaign follow up node found'
+      )
+    }
+
+    return {
+      contents: await this.flowBuilderPlugin.getContentsByNode(
+        followUpNode ?? campaignStartNode
+      ),
+      campaignFirstMessageId: campaignId,
+    }
+  }
+
+  private getCampaignStartNode(campaignId: string): HtNodeWithContent {
+    const campaignStartNode =
+      this.cmsApi.getNodeByCampaignId<HtNodeWithContent>(campaignId)
+
+    if (!campaignStartNode) {
+      throw new PushFlowError(
+        PushFlowErrorCode.NoCampaignStartNode,
+        'No campaign start node found'
+      )
+    }
+
+    return campaignStartNode
+  }
+}

package/src/api.ts

@@ -82,12 +82,22 @@ export class FlowBuilderApi {
     return this.getNodeById<HtNodeWithContent>(subFlow.start_node_id)
   }
 
-  getNodeByCampaignId<T extends HtNodeComponent>(id: string): T {
+  getNodeByCampaignId<T extends HtNodeComponent>(id: string): T | undefined {
     const campaign = this.flow.campaigns.find(campaign => campaign.id === id)
     if (!campaign) {
-      throw Error(`Campaign with id: '${id}' not found`)
+      return undefined
     }
-    return this.getNodeById<T>(campaign.start_node_id)
+
+    const node = this.flow.nodes.find(
+      flowNode => flowNode.id === campaign.start_node_id
+    )
+
+    if (!node) {
+      console.error(`Node with id: '${campaign.start_node_id}' not found`)
+      return undefined
+    }
+
+    return node as T
   }
 
   getNodeById<T extends HtNodeComponent>(id: string): T {

package/src/content-fields/flow-do-nothing.tsx

@@ -8,7 +8,7 @@ export class FlowDoNothing extends ContentFieldsBase {
   static fromHubtypeCMS(cmsDoNothing: HtDoNothingNode): FlowDoNothing {
     const newDoNothing = new FlowDoNothing(cmsDoNothing.id)
     newDoNothing.code = cmsDoNothing.code
-    newDoNothing.followUp = cmsDoNothing.follow_up
+    newDoNothing.followUp = undefined
 
     return newDoNothing
   }

package/src/content-fields/flow-update-variables.tsx

@@ -41,8 +41,12 @@ export class FlowUpdateVariables extends ContentFieldsBase {
       value: string | number | boolean | undefined
     }[] = []
 
-    for (const [keyPath, value] of Object.entries(this.setVariables)) {
+    const updateVariable = (
+      keyPath: string,
+      value: string | number | boolean | undefined
+    ) => {
       const fieldName = this.getContactInfoFieldName(keyPath)
+
       if (fieldName) {
         this.updateSessionContactInfoField(botContext, fieldName, value)
         contactInfoUpdates.push({ fieldName, value })
@@ -51,14 +55,12 @@ export class FlowUpdateVariables extends ContentFieldsBase {
       }
     }
 
+    for (const [keyPath, value] of Object.entries(this.setVariables)) {
+      updateVariable(keyPath, value)
+    }
+
     for (const keyPath of this.unsetVariables) {
-      const fieldName = this.getContactInfoFieldName(keyPath)
-      if (fieldName) {
-        this.updateSessionContactInfoField(botContext, fieldName, undefined)
-        contactInfoUpdates.push({ fieldName, value: undefined })
-      } else {
-        this.setSessionValueFromKeyPath(botContext, keyPath, undefined)
-      }
+      updateVariable(keyPath, undefined)
     }
 
     if (contactInfoUpdates.length === 0) {