@botonic/plugin-flow-builder 0.25.0-alpha.9 → 0.25.0

package/lib/esm/user-input/smart-intent.js

@@ -0,0 +1,36 @@
+import { __awaiter } from "tslib";
+import axios from 'axios';
+export function getSmartIntentNodeByInput(cmsApi, request) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const smartIntentNodes = cmsApi.getSmartIntentNodes();
+        const intentsInferenceParams = smartIntentNodes.map(smartIntentNode => {
+            return {
+                name: smartIntentNode.content.title,
+                definition: smartIntentNode.content.description,
+            };
+        });
+        intentsInferenceParams.push({
+            name: 'Other',
+            definition: 'The text does not belong to any other intent.',
+        });
+        try {
+            const response = yield axios({
+                method: 'POST',
+                url: `${process.env.HUBTYPE_API_URL}/external/v1/ai/smart_intents/inference/`,
+                headers: {
+                    Authorization: `Bearer ${request.session._access_token}`,
+                    'Content-Type': 'application/json',
+                },
+                data: { text: request.input.data, intents: intentsInferenceParams },
+                timeout: 10000,
+            });
+            console.log({ response });
+            return smartIntentNodes.find(smartIntentNode => smartIntentNode.content.title === response.data.intent_name);
+        }
+        catch (e) {
+            console.error(e);
+            return undefined;
+        }
+    });
+}
+//# sourceMappingURL=smart-intent.js.map

package/lib/esm/user-input/smart-intent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"smart-intent.js","sourceRoot":"","sources":["../../../src/user-input/smart-intent.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,MAAM,UAAgB,yBAAyB,CAC7C,MAAsB,EACtB,OAAsB;;QAEtB,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAA;QACrD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACpE,OAAO;gBACL,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK;gBACnC,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC,WAAW;aAChD,CAAA;QACH,CAAC,CAAC,CAAA;QACF,sBAAsB,CAAC,IAAI,CAAC;YAC1B,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,+CAA+C;SAC5D,CAAC,CAAA;QACF,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC;gBAC3B,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,0CAA0C;gBAC7E,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE;oBACxD,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE;gBACnE,OAAO,EAAE,KAAK;aACf,CAAC,CAAA;YACF,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;YACzB,OAAO,gBAAgB,CAAC,IAAI,CAC1B,eAAe,CAAC,EAAE,CAChB,eAAe,CAAC,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,IAAI,CAAC,WAAW,CAC9D,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChB,OAAO,SAAS,CAAA;SACjB;IACH,CAAC;CAAA"}

package/lib/esm/utils.d.ts

@@ -1,3 +1,5 @@
 import { Session } from '@botonic/core';
+import { ActionRequest } from '@botonic/react';
 import { BotonicPluginFlowBuilderOptions } from './types';
 export declare function resolveGetAccessToken(options: BotonicPluginFlowBuilderOptions): (session: Session) => string;
+export declare function getValueFromKeyPath(request: ActionRequest, keyPath: string): any;

package/lib/esm/utils.js

@@ -15,4 +15,20 @@ export function resolveGetAccessToken(options) {
             throw new Error('No method defined for getting access token');
     }
 }
+export function getValueFromKeyPath(request, keyPath) {
+    if (keyPath.startsWith('input') || keyPath.startsWith('session')) {
+        return keyPath
+            .split('.')
+            .reduce((object, key) => resolveObjectKey(object, key), request);
+    }
+    return keyPath
+        .split('.')
+        .reduce((object, key) => resolveObjectKey(object, key), request.session.user.extra_data);
+}
+function resolveObjectKey(object, key) {
+    if (object && object[key] !== undefined) {
+        return object[key];
+    }
+    return undefined;
+}
 //# sourceMappingURL=utils.js.map

package/lib/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmC,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE7E,SAAS,yBAAyB,CAAC,OAAgB;IACjD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;KACpD;IACD,OAAO,OAAO,CAAC,aAAa,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAwC;IAExC,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC5B,KAAK,kBAAkB,CAAC,UAAU;YAChC,OAAO,yBAAyB,CAAA;QAClC,KAAK,kBAAkB,CAAC,WAAW;YACjC,OAAO,OAAO,CAAC,cAAc,CAAA;QAC/B;YACE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;KAChE;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmC,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAE7E,SAAS,yBAAyB,CAAC,OAAgB;IACjD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;KACpD;IACD,OAAO,OAAO,CAAC,aAAa,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAwC;IAExC,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC5B,KAAK,kBAAkB,CAAC,UAAU;YAChC,OAAO,yBAAyB,CAAA;QAClC,KAAK,kBAAkB,CAAC,WAAW;YACjC,OAAO,OAAO,CAAC,cAAc,CAAA;QAC/B;YACE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;KAChE;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAsB,EACtB,OAAe;IAEf,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAChE,OAAO,OAAO;aACX,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;KACnE;IAED,OAAO,OAAO;SACX,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CACL,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAChC,CAAA;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAW,EAAE,GAAW;IAChD,IAAI,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;QACvC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;KACnB;IACD,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@botonic/plugin-flow-builder",
-  "version": "0.25.0-alpha.9",
+  "version": "0.25.0",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "description": "Use Flow Builder to show your contents",
   "scripts": {
     "build": "rm -rf lib && ../../node_modules/.bin/tsc -p tsconfig.json && ../../node_modules/.bin/tsc -p tsconfig.esm.json",
     "build:watch": "npm run build -- --watch",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo Skipping tests...",
     "cloc": "../../scripts/qa/cloc-package.sh .",
     "prepublishOnly": "rm -rf lib && npm i && npm run build",
     "lint": "npm run lint_core -- --fix",
     "lint_core": "../../node_modules/.bin/eslint_d --cache --quiet 'src/**/*.ts*'"
   },
   "dependencies": {
-    "@botonic/react": "0.25.0-alpha.6",
-    "axios": "^1.6.7",
+    "@botonic/react": "^0.25.0",
+    "axios": "^1.6.8",
     "uuid": "^9.0.1"
   },
   "repository": {

package/src/action/index.tsx

@@ -6,7 +6,7 @@ import { FlowContent, FlowHandoff } from '../content-fields'
 import { HtNodeWithContent } from '../content-fields/hubtype-fields'
 import { getFlowBuilderPlugin } from '../helpers'
 import { createNodeFromKnowledgeBase } from './knowledge-bases'
-import { EventName, trackEvent } from './tracking'
+import { EventName, trackEvent } from '../tracking'
 
 export type FlowBuilderActionProps = {
   contents: FlowContent[]
@@ -38,16 +38,18 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
 
   render(): JSX.Element | JSX.Element[] {
     const { contents } = this.props
-    return contents.map(content => content.toBotonic(content.id))
+    const request = this.context
+    return contents.map(content => content.toBotonic(content.id, request))
   }
 }
 
 export class FlowBuilderMultichannelAction extends FlowBuilderAction {
   render(): JSX.Element | JSX.Element[] {
     const { contents } = this.props
+    const request = this.context
     return (
       <Multichannel text={{ buttonsAsText: false }}>
-        {contents.map(content => content.toBotonic(content.id))}
+        {contents.map(content => content.toBotonic(content.id, request))}
       </Multichannel>
     )
   }

package/src/action/knowledge-bases.ts

@@ -9,7 +9,7 @@ import {
   HtTextNode,
 } from '../content-fields/hubtype-fields'
 import { getFlowBuilderPlugin } from '../helpers'
-import { EventName, trackEvent } from './tracking'
+import { EventName, trackEvent } from '../tracking'
 
 export async function createNodeFromKnowledgeBase(
   cmsApi: FlowBuilderApi,
@@ -17,6 +17,7 @@ export async function createNodeFromKnowledgeBase(
 ): Promise<HtNodeWithContent | undefined> {
   const flowBuilderPlugin = getFlowBuilderPlugin(request.plugins)
   const locale = flowBuilderPlugin.getLocale(request.session)
+  const resolvedLocale = cmsApi.getResolvedLocale(locale)
   const knowledgeBaseConfig = cmsApi.getKnowledgeBaseConfig()
 
   if (
@@ -26,7 +27,6 @@ export async function createNodeFromKnowledgeBase(
     try {
       const knowledgeBaseResponse =
         await flowBuilderPlugin.getKnowledgeBaseResponse(request)
-
       if (knowledgeBaseResponse.hasKnowledge) {
         await trackEvent(request, EventName.botAiKnowledgeBase, {
           answer: knowledgeBaseResponse.answer,
@@ -41,12 +41,13 @@ export async function createNodeFromKnowledgeBase(
             text: [
               {
                 message: knowledgeBaseResponse.answer,
-                locale,
+                locale: resolvedLocale,
               },
             ],
             buttons_style: undefined,
             buttons: [],
           },
+          flow_id: 'randomUUID', // TODO: Add flow_id consequentially with HtBaseNode changes
           id: uuid(),
           code: 'knowledge-response',
           meta: {

package/src/api.ts

@@ -1,11 +1,12 @@
 import { Input, PluginPreRequest } from '@botonic/core'
 import axios from 'axios'
 
-import { SEPARATOR } from './constants'
+import { REG_EXP_PATTERN, SEPARATOR } from './constants'
 import {
   HtBotActionNode,
   HtFallbackNode,
   HtFlowBuilderData,
+  HtGoToFlow,
   HtIntentNode,
   HtKeywordNode,
   HtNodeComponent,
@@ -15,6 +16,7 @@ import {
   HtNodeWithoutContentType,
   HtPayloadNode,
 } from './content-fields/hubtype-fields'
+import { HtSmartIntentNode } from './content-fields/hubtype-fields/smart-intent'
 import { FlowBuilderApiOptions } from './types'
 
 export class FlowBuilderApi {
@@ -56,11 +58,11 @@ export class FlowBuilderApi {
     return node as T
   }
 
-  getNodeByCode(code: string): HtNodeComponent {
+  getNodeByContentID(contentID: string): HtNodeComponent {
     const content = this.flow.nodes.find(node =>
-      'code' in node ? node.code === code : false
+      'code' in node ? node.code === contentID : false
     )
-    if (!content) throw Error(`Node with code: '${code}' not found`)
+    if (!content) throw Error(`Node with contentID: '${contentID}' not found`)
     return content
   }
 
@@ -124,6 +126,12 @@ export class FlowBuilderApi {
     return undefined
   }
 
+  getSmartIntentNodes(): HtSmartIntentNode[] {
+    return this.flow.nodes.filter(
+      node => node.type === HtNodeWithContentType.SMART_INTENT
+    ) as HtSmartIntentNode[]
+  }
+
   private nodeContainsIntent(
     node: HtIntentNode,
     intent: string,
@@ -169,13 +177,30 @@ export class FlowBuilderApi {
     locale: string
   ): boolean {
     const result = node.content.keywords.find(
-      i => i.locale === locale && this.containsAnyKeywords(input, i.values)
+      keywords =>
+        keywords.locale === locale &&
+        this.inputMatchesAnyKeyword(input, keywords.values)
     )
     return Boolean(result)
   }
 
-  private containsAnyKeywords(input: string, keywords: string[]): boolean {
-    return keywords.some(keyword => input.includes(keyword))
+  private inputMatchesAnyKeyword(input: string, keywords: string[]): boolean {
+    return keywords.some(keyword => {
+      const regExpMatchArray = keyword.match(REG_EXP_PATTERN)
+      if (regExpMatchArray) {
+        return this.resolveKeywordAsRegExp(regExpMatchArray, input)
+      }
+      return input.includes(keyword)
+    })
+  }
+
+  private resolveKeywordAsRegExp(
+    regExpMatchArray: RegExpMatchArray,
+    input: string
+  ) {
+    const [, pattern, flags] = regExpMatchArray
+    const keywordAsRegExp = new RegExp(pattern, flags)
+    return input.match(keywordAsRegExp)
   }
 
   getPayload(target?: HtNodeLink): string | undefined {
@@ -197,13 +222,31 @@ export class FlowBuilderApi {
     const customParams = JSON.parse(
       botActionNode.content.payload_params || '{}'
     )
+
+    const followUpContentID = this.getFollowUpContentID(
+      botActionNode.follow_up?.id
+    )
+
     const payloadJson = JSON.stringify({
       ...customParams,
-      followUpId: botActionNode.follow_up?.id,
+      followUpContentID,
     })
     return `${payloadNode.content.payload}${SEPARATOR}${payloadJson}`
   }
 
+  private getFollowUpContentID(id?: string): string | undefined {
+    const followUpNode = id
+      ? this.getNodeById<HtNodeWithContent | HtGoToFlow>(id)
+      : undefined
+
+    if (followUpNode?.type === HtNodeWithoutContentType.GO_TO_FLOW) {
+      return this.getNodeById<HtNodeWithContent>(followUpNode?.content.flow_id)
+        .code
+    } else {
+      return followUpNode?.code
+    }
+  }
+
   getResolvedLocale(locale: string): string {
     if (this.flow.locales.find(flowLocale => flowLocale === locale)) {
       return locale

package/src/constants.ts

@@ -1,3 +1,5 @@
 export const SEPARATOR = '|'
 export const SOURCE_INFO_SEPARATOR = `${SEPARATOR}source_`
-export const VARIABLE_REGEX = /{([^}]+)}/g
+export const VARIABLE_PATTERN = /{([^}]+)}/g
+export const ACCESS_TOKEN_VARIABLE_KEY = '_access_token'
+export const REG_EXP_PATTERN = /^\/(.*)\/([gimyus]*)$/

package/src/content-fields/flow-handoff.tsx

@@ -2,7 +2,7 @@ import { HandOffBuilder } from '@botonic/core'
 import { ActionRequest, WebchatSettings } from '@botonic/react'
 import React from 'react'
 
-import { EventName, trackEvent } from '../action/tracking'
+import { EventName, trackEvent } from '../tracking'
 import { FlowBuilderApi } from '../api'
 import { getQueueAvailability } from '../functions/conditional-queue-status'
 import { ContentFieldsBase } from './content-fields-base'

package/src/content-fields/flow-text.tsx

@@ -1,8 +1,9 @@
-import { Text } from '@botonic/react'
+import { ActionRequest, Text } from '@botonic/react'
 import React from 'react'
 
 import { FlowBuilderApi } from '../api'
-import { VARIABLE_REGEX } from '../constants'
+import { ACCESS_TOKEN_VARIABLE_KEY, VARIABLE_PATTERN } from '../constants'
+import { getValueFromKeyPath } from '../utils'
 import { ContentFieldsBase } from './content-fields-base'
 import { FlowButton } from './flow-button'
 import { HtButtonStyle, HtTextNode } from './hubtype-fields'
@@ -21,38 +22,43 @@ export class FlowText extends ContentFieldsBase {
     const newText = new FlowText(cmsText.id)
     newText.code = cmsText.code
     newText.buttonStyle = cmsText.content.buttons_style || HtButtonStyle.BUTTON
-    newText.text = this.replaceVariables(
-      this.getTextByLocale(locale, cmsText.content.text),
-      cmsApi.request.session.user.extra_data
-    )
+    newText.text = this.getTextByLocale(locale, cmsText.content.text)
     newText.buttons = cmsText.content.buttons.map(button =>
       FlowButton.fromHubtypeCMS(button, locale, cmsApi)
     )
     return newText
   }
 
-  static replaceVariables(
-    text: string,
-    extraData?: Record<string, any>
-  ): string {
-    const matches = text.match(VARIABLE_REGEX)
+  static replaceVariables(text: string, request: ActionRequest): string {
+    const matches = text.match(VARIABLE_PATTERN)
 
     let replacedText = text
-    if (matches && extraData) {
+    if (matches && request) {
       matches.forEach(match => {
-        const variable = match.slice(1, -1)
-        const value = extraData[variable] ?? match
-        replacedText = replacedText.replace(match, value)
+        const keyPath = match.slice(1, -1)
+        const botVariable = keyPath.endsWith(ACCESS_TOKEN_VARIABLE_KEY)
+          ? match
+          : getValueFromKeyPath(request, keyPath)
+        replacedText = replacedText.replace(
+          match,
+          this.isValidType(botVariable) ? botVariable : match
+        )
       })
     }
 
     return replacedText
   }
 
-  toBotonic(id: string): JSX.Element {
+  private static isValidType(botVariable: any): boolean {
+    const validTypes = ['boolean', 'string', 'number']
+    return validTypes.includes(typeof botVariable)
+  }
+
+  toBotonic(id: string, request: ActionRequest): JSX.Element {
+    const replacedText = FlowText.replaceVariables(this.text, request)
     return (
       <Text key={id}>
-        {this.text}
+        {replacedText}
         {this.buttons.map((button, buttonIndex) =>
           button.renderButton(buttonIndex, this.buttonStyle)
         )}

package/src/content-fields/hubtype-fields/common.ts

@@ -31,6 +31,7 @@ export interface HtBaseNode {
   }
   follow_up?: HtNodeLink
   target?: HtNodeLink
+  flow_id: string // TODO: Review if this field is necessary in all HtBaseNode
 }
 
 export interface HtTextLocale {

package/src/content-fields/hubtype-fields/index.ts

@@ -12,6 +12,7 @@ export * from './keyword'
 export * from './node-types'
 export * from './nodes'
 export * from './payload'
+export * from './smart-intent'
 export * from './text'
 export * from './url'
 export * from './video'

package/src/content-fields/hubtype-fields/node-types.ts

@@ -5,6 +5,7 @@ export enum HtNodeWithContentType {
   TEXT = 'text',
   KEYWORD = 'keyword',
   INTENT = 'intent',
+  SMART_INTENT = 'smart-intent',
   FUNCTION = 'function',
   FALLBACK = 'fallback',
   VIDEO = 'video',

package/src/content-fields/hubtype-fields/nodes.ts

@@ -8,6 +8,7 @@ import { HtImageNode } from './image'
 import { HtIntentNode } from './intent'
 import { HtKeywordNode } from './keyword'
 import { HtPayloadNode } from './payload'
+import { HtSmartIntentNode } from './smart-intent'
 import { HtTextNode } from './text'
 import { HtUrlNode } from './url'
 import { HtVideoNode } from './video'
@@ -24,6 +25,7 @@ export type HtNodeWithContent =
   | HtFunctionNode
   | HtFallbackNode
   | HtWhatsappButtonListNode
+  | HtSmartIntentNode
 
 export type HtNodeWithoutContent =
   | HtUrlNode

package/src/content-fields/hubtype-fields/smart-intent.ts

@@ -0,0 +1,12 @@
+import { HtBaseNode } from './common'
+import { HtNodeWithContentType } from './node-types'
+
+interface SmartIntent {
+  title: string
+  description: string
+}
+
+export interface HtSmartIntentNode extends HtBaseNode {
+  type: HtNodeWithContentType.SMART_INTENT
+  content: SmartIntent
+}

package/src/content-fields/whatsapp-button-list/flow-whatsapp-button-list-row.tsx

@@ -1,5 +1,6 @@
 import { WhatsappButtonListRowProps } from '@botonic/react'
 
+import { FlowBuilderApi } from '../../api'
 import { SOURCE_INFO_SEPARATOR } from '../../constants'
 import { ContentFieldsBase } from '../content-fields-base'
 import { HtWhatsappButtonListRow } from '../hubtype-fields'
@@ -11,12 +12,13 @@ export class FlowWhatsappButtonListRow extends ContentFieldsBase {
 
   static fromHubtypeCMS(
     component: HtWhatsappButtonListRow,
-    locale: string
+    locale: string,
+    cmsApi: FlowBuilderApi
   ): FlowWhatsappButtonListRow {
     const newRow = new FlowWhatsappButtonListRow(component.id)
     newRow.title = this.getTextByLocale(locale, component.text)
     newRow.description = this.getTextByLocale(locale, component.description)
-    newRow.targetId = component.target?.id
+    newRow.targetId = cmsApi.getPayload(component.target)
     return newRow
   }
 

package/src/content-fields/whatsapp-button-list/flow-whatsapp-button-list-section.tsx

@@ -3,6 +3,7 @@ import {
   WhatsappButtonListSectionProps,
 } from '@botonic/react'
 
+import { FlowBuilderApi } from '../../api'
 import { HtWhatsappButtonListSection } from '../hubtype-fields'
 import { ContentFieldsBase } from './../content-fields-base'
 import { FlowWhatsappButtonListRow } from './flow-whatsapp-button-list-row'
@@ -13,12 +14,13 @@ export class FlowWhatsappButtonListSection extends ContentFieldsBase {
 
   static fromHubtypeCMS(
     component: HtWhatsappButtonListSection,
-    locale: string
+    locale: string,
+    cmsApi: FlowBuilderApi
   ): FlowWhatsappButtonListSection {
     const newButton = new FlowWhatsappButtonListSection(component.id)
     newButton.title = this.getTextByLocale(locale, component.title)
     newButton.rows = component.rows.map(row =>
-      FlowWhatsappButtonListRow.fromHubtypeCMS(row, locale)
+      FlowWhatsappButtonListRow.fromHubtypeCMS(row, locale, cmsApi)
     )
     return newButton
   }

package/src/content-fields/whatsapp-button-list/flow-whatsapp-button-list.tsx

@@ -1,6 +1,7 @@
 import { WhatsappButtonList } from '@botonic/react'
 import React from 'react'
 
+import { FlowBuilderApi } from '../../api'
 import { HtWhatsappButtonListNode } from '../hubtype-fields'
 import { ContentFieldsBase } from './../content-fields-base'
 import { FlowWhatsappButtonListSection } from './flow-whatsapp-button-list-section'
@@ -13,7 +14,8 @@ export class FlowWhatsappButtonList extends ContentFieldsBase {
 
   static fromHubtypeCMS(
     component: HtWhatsappButtonListNode,
-    locale: string
+    locale: string,
+    cmsApi: FlowBuilderApi
   ): FlowWhatsappButtonList {
     const newWhatsappButtonList = new FlowWhatsappButtonList(component.id)
     newWhatsappButtonList.code = component.code
@@ -26,7 +28,7 @@ export class FlowWhatsappButtonList extends ContentFieldsBase {
       component.content.button_text
     )
     newWhatsappButtonList.sections = component.content.sections.map(section =>
-      FlowWhatsappButtonListSection.fromHubtypeCMS(section, locale)
+      FlowWhatsappButtonListSection.fromHubtypeCMS(section, locale, cmsApi)
     )
     return newWhatsappButtonList
   }

package/src/functions/conditional-bot-variable.ts

@@ -0,0 +1,18 @@
+import { ActionRequest } from '@botonic/react'
+
+import { getValueFromKeyPath } from '../utils'
+
+interface ConditionalCountryArgs {
+  request: ActionRequest
+  results: string[]
+  keyPath: string
+}
+
+export function conditionalBotVariable({
+  request,
+  results,
+  keyPath,
+}: ConditionalCountryArgs): string {
+  const botVariable = getValueFromKeyPath(request, keyPath)
+  return results.find(result => result === botVariable) ?? 'default'
+}

package/src/functions/conditional-country.ts

@@ -0,0 +1,14 @@
+import { ActionRequest } from '@botonic/react'
+
+interface ConditionalCountryArgs {
+  request: ActionRequest
+  results: string[]
+}
+
+export function conditionalCountry({
+  request,
+  results,
+}: ConditionalCountryArgs): string {
+  const country = request.session.user.extra_data.country
+  return results.find(result => result === country) || 'default'
+}

package/src/functions/conditional-provider.ts

@@ -10,6 +10,5 @@ export function conditionalProvider({
   results,
 }: ConditionalProviderArgs): string {
   const provider = request.session.user.provider
-  if (results.includes(provider)) return provider
-  return 'default'
+  return results.find(result => result === provider) || 'default'
 }

package/src/functions/index.ts

@@ -1,3 +1,5 @@
+import { conditionalBotVariable } from './conditional-bot-variable'
+import { conditionalCountry } from './conditional-country'
 import { conditionalProvider } from './conditional-provider'
 import { conditionalQueueStatus } from './conditional-queue-status'
 
@@ -5,4 +7,6 @@ export const DEFAULT_FUNCTIONS = {
   // TODO: Rename api action name
   'check-queue-status': conditionalQueueStatus,
   'get-channel-type': conditionalProvider,
+  'check-country': conditionalCountry,
+  'check-bot-variable': conditionalBotVariable,
 }

package/src/index.ts

@@ -1,7 +1,6 @@
 import { Plugin, PluginPreRequest, Session } from '@botonic/core'
 import { ActionRequest } from '@botonic/react'
 
-import { getNodeByUserInput } from './action/user-input'
 import { FlowBuilderApi } from './api'
 import { SEPARATOR, SOURCE_INFO_SEPARATOR } from './constants'
 import {
@@ -28,6 +27,7 @@ import {
   KnowledgeBaseResponse,
   PayloadParamsBase,
 } from './types'
+import { getNodeByUserInput } from './user-input'
 import { resolveGetAccessToken } from './utils'
 
 export default class BotonicPluginFlowBuilder implements Plugin {
@@ -90,16 +90,21 @@ export default class BotonicPluginFlowBuilder implements Plugin {
     }
   }
 
-  async getContentsByCode(
-    code: string,
+  async getContentsByContentID(
+    contentID: string,
     locale: string,
     prevContents?: FlowContent[]
   ): Promise<FlowContent[]> {
-    const node = this.cmsApi.getNodeByCode(code) as HtNodeWithContent
+    const node = this.cmsApi.getNodeByContentID(contentID) as HtNodeWithContent
     return await this.getContentsByNode(node, locale, prevContents)
   }
 
-  async getContentsById(
+  getUUIDByContentID(contentID: string): string {
+    const node = this.cmsApi.getNodeByContentID(contentID)
+    return node.id
+  }
+
+  private async getContentsById(
     id: string,
     locale: string,
     prevContents?: FlowContent[]
@@ -153,7 +158,11 @@ export default class BotonicPluginFlowBuilder implements Plugin {
       case HtNodeWithContentType.VIDEO:
         return FlowVideo.fromHubtypeCMS(hubtypeContent, locale)
       case HtNodeWithContentType.WHATSAPP_BUTTON_LIST:
-        return FlowWhatsappButtonList.fromHubtypeCMS(hubtypeContent, locale)
+        return FlowWhatsappButtonList.fromHubtypeCMS(
+          hubtypeContent,
+          locale,
+          this.cmsApi
+        )
       case HtNodeWithContentType.HANDOFF:
         return FlowHandoff.fromHubtypeCMS(hubtypeContent, locale, this.cmsApi)
       default:

package/src/{action/tracking.ts → tracking.ts}

@@ -1,6 +1,6 @@
 import { ActionRequest } from '@botonic/react'
 
-import { getFlowBuilderPlugin } from '../helpers'
+import { getFlowBuilderPlugin } from './helpers'
 
 export async function trackEvent(
   request: ActionRequest,

package/src/types.ts

@@ -41,5 +41,5 @@ export interface KnowledgeBaseResponse {
 }
 
 export interface PayloadParamsBase {
-  followUpId?: string
+  followUpContentID?: string
 }