@botonic/plugin-flow-builder 0.25.0-alpha.8 → 0.25.0-beta.0

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/conditional-queue-status.ts

@@ -7,14 +7,24 @@ type ConditionalQueueStatusArgs = {
   request: ActionRequest
   queue_id: string
   queue_name: string
+  check_available_agents: boolean
+}
+
+enum QueueStatusResult {
+  OPEN = 'open',
+  CLOSED = 'closed',
+  OPEN_WITHOUT_AGENTS = 'open-without-agents',
 }
 
 export async function conditionalQueueStatus({
   queue_id,
-}: ConditionalQueueStatusArgs): Promise<string> {
-  const data = await getQueueAvailability(queue_id)
-  const isAvailable = data.available
-  return isAvailable ? 'open' : 'closed'
+  check_available_agents,
+}: ConditionalQueueStatusArgs): Promise<QueueStatusResult> {
+  const data = await getQueueAvailability(queue_id, check_available_agents)
+  if (check_available_agents && data.open && data.available_agents === 0) {
+    return QueueStatusResult.OPEN_WITHOUT_AGENTS
+  }
+  return data.open ? QueueStatusResult.OPEN : QueueStatusResult.CLOSED
 }
 
 interface AvailabilityData {
@@ -27,7 +37,8 @@ interface AvailabilityData {
 }
 
 export async function getQueueAvailability(
-  queueId: string
+  queueId: string,
+  checkAvailableAgents = false
 ): Promise<AvailabilityData> {
   const response = await axios.get(
     `${HUBTYPE_API_URL}/public/v1/queues/${queueId}/availability/`,
@@ -36,7 +47,7 @@ export async function getQueueAvailability(
       params: {
         check_queue_schedule: true,
         check_waiting_cases: false,
-        check_available_agents: false,
+        check_available_agents: checkAvailableAgents,
       },
     }
   )

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

@@ -15,6 +15,8 @@ import {
 } from './content-fields'
 import {
   HtFlowBuilderData,
+  HtFunctionArgument,
+  HtFunctionArguments,
   HtFunctionNode,
   HtNodeComponent,
   HtNodeWithContent,
@@ -71,9 +73,11 @@ export default class BotonicPluginFlowBuilder implements Plugin {
       !request.session.is_first_interaction
 
     if (checkUserTextInput) {
+      const locale = this.getLocale(request.session)
+      const resolvedLocale = this.cmsApi.getResolvedLocale(locale)
       const nodeByUserInput = await getNodeByUserInput(
         this.cmsApi,
-        this.getLocale(request.session),
+        resolvedLocale,
         request as unknown as ActionRequest
       )
       request.input.payload = this.cmsApi.getPayload(nodeByUserInput?.target)
@@ -115,18 +119,21 @@ export default class BotonicPluginFlowBuilder implements Plugin {
     prevContents?: FlowContent[]
   ): Promise<FlowContent[]> {
     const contents = prevContents || []
-
-    const content = this.getFlowContent(node, locale)
+    const resolvedLocale = this.cmsApi.getResolvedLocale(locale)
 
     if (node.type === HtNodeWithContentType.FUNCTION) {
-      const targetId = await this.callFunction(node, locale)
-      return this.getContentsById(targetId, locale, contents)
-    } else {
-      if (content) contents.push(content)
-      // TODO: prevent infinite recursive calls
-
-      if (node.follow_up)
-        return this.getContentsById(node.follow_up.id, locale, contents)
+      const targetId = await this.callFunction(node, resolvedLocale)
+      return this.getContentsById(targetId, resolvedLocale, contents)
+    }
+
+    const content = this.getFlowContent(node, resolvedLocale)
+    if (content) {
+      contents.push(content)
+    }
+    // TODO: prevent infinite recursive calls
+
+    if (node.follow_up) {
+      return this.getContentsById(node.follow_up.id, resolvedLocale, contents)
     }
 
     return contents
@@ -146,7 +153,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:
@@ -154,15 +165,18 @@ export default class BotonicPluginFlowBuilder implements Plugin {
     }
   }
 
-  async callFunction(
+  private async callFunction(
     functionNode: HtFunctionNode,
     locale: string
   ): Promise<string> {
     const functionNodeId = functionNode.id
-    const nameValues =
-      functionNode.content.arguments
-        .find(arg => arg.locale === locale)
-        ?.values.map(value => ({ [value.name]: value.value })) || []
+    const functionArguments = this.getArgumentsByLocale(
+      functionNode.content.arguments,
+      locale
+    )
+    const nameValues = functionArguments.map(arg => {
+      return { [arg.name]: arg.value }
+    })
 
     const args = Object.assign(
       {
@@ -185,6 +199,23 @@ export default class BotonicPluginFlowBuilder implements Plugin {
     return result.target.id
   }
 
+  private getArgumentsByLocale(
+    args: HtFunctionArguments[],
+    locale: string
+  ): HtFunctionArgument[] {
+    let resultArguments: HtFunctionArgument[] = []
+    for (const arg of args) {
+      if ('locale' in arg && arg.locale === locale) {
+        resultArguments = [...resultArguments, ...arg.values]
+      }
+      if ('type' in arg) {
+        resultArguments = [...resultArguments, arg]
+      }
+    }
+
+    return resultArguments
+  }
+
   getPayloadParams<T extends PayloadParamsBase>(payload: string): T {
     const payloadParams = JSON.parse(payload.split(SEPARATOR)[1] || '{}')
     return payloadParams

package/src/utils.ts

@@ -1,4 +1,5 @@
 import { Session } from '@botonic/core'
+import { ActionRequest } from '@botonic/react'
 
 import { BotonicPluginFlowBuilderOptions, ProcessEnvNodeEnvs } from './types'
 
@@ -21,3 +22,28 @@ export function resolveGetAccessToken(
       throw new Error('No method defined for getting access token')
   }
 }
+
+export function getValueFromKeyPath(
+  request: ActionRequest,
+  keyPath: string
+): any {
+  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: any, key: string): any {
+  if (object && object[key] !== undefined) {
+    return object[key]
+  }
+  return undefined
+}