plugin-flow-builder: move contentFilter from action to each content

packages/botonic-plugin-flow-builder/src/action/index.tsx

@@ -8,7 +8,6 @@ import {
 import React from 'react'
 
 import { FlowAiAgent, type FlowContent } from '../content-fields'
-import { filterContents } from '../filters'
 import { splitAiAgentContents } from '../utils/ai-agent'
 import { getFlowBuilderActionContext } from './context'
 import { getContentsByFirstInteraction } from './first-interaction'
@@ -55,11 +54,9 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
     botContext: BotContext,
     contents: FlowContent[]
   ) {
-    const filteredContents = await filterContents(botContext, contents)
-
-    for (const content of filteredContents) {
+    for (const content of contents) {
       if (content instanceof FlowAiAgent) {
-        const splitContents = splitAiAgentContents(filteredContents)
+        const splitContents = splitAiAgentContents(contents)
         if (!splitContents) {
           continue
         }
@@ -70,7 +67,7 @@ export class FlowBuilderAction extends React.Component<FlowBuilderActionProps> {
       }
     }
 
-    return filteredContents
+    return contents
   }
 
   protected getWebchatSettingsParams(botContext: BotContext): {

packages/botonic-plugin-flow-builder/src/content-fields/content-fields-base.ts

@@ -1,16 +1,18 @@
 import type { BotContext } from '@botonic/core'
-
 import {
   ACCESS_TOKEN_VARIABLE_KEY,
   VARIABLE_PATTERN_GLOBAL,
 } from '../constants'
+import { ContentFilterExecutor } from '../filters'
+import { getFlowBuilderPlugin } from '../utils/get-flow-builder-plugin'
 import type {
   HtMediaFileLocale,
   HtNodeLink,
   HtQueueLocale,
   HtTextLocale,
   HtVideoLocale,
 } from './hubtype-fields'
+import type { FlowContent } from './index'
 
 export abstract class ContentFieldsBase {
   public code: string
@@ -22,6 +24,22 @@ export abstract class ContentFieldsBase {
 
   abstract processContent(botContext: BotContext): Promise<void>
 
+  async filterContent(
+    botContext: BotContext,
+    content: FlowContent
+  ): Promise<FlowContent> {
+    const flowBuilderPlugin = getFlowBuilderPlugin(botContext.plugins)
+    const contentFilters = flowBuilderPlugin.contentFilters
+    const contentFilterExecutor = new ContentFilterExecutor({
+      filters: contentFilters,
+    })
+    const filteredContent = await contentFilterExecutor.filter(
+      botContext,
+      content
+    )
+    return filteredContent
+  }
+
   static getTextByLocale(locale: string, text: HtTextLocale[]): string {
     const result = text.find(t => t.locale === locale)
     return result?.message ?? ''

packages/botonic-plugin-flow-builder/src/content-fields/flow-ai-agent.tsx

@@ -70,7 +70,6 @@ export class FlowAiAgent extends ContentFieldsBase {
       this.aiAgentResponse = aiAgentResponse
       await this.trackAiAgentResponse(botContext)
       this.messages = aiAgentResponse.messages
-      await this.messagesToBotonicJSXElements(botContext)
     }
 
     return aiAgentResponse
@@ -195,6 +194,8 @@ export class FlowAiAgent extends ContentFieldsBase {
   ): Promise<void> {
     if (this.messages.length === 0) {
       await this.resolveAIAgentResponse(botContext, previousContents)
+      await this.filterContent(botContext, this)
+      await this.messagesToBotonicJSXElements(botContext)
     }
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-bot-action.tsx

@@ -52,6 +52,7 @@ export class FlowBotAction extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     this.doBotAction(botContext)
     await this.trackFlow(botContext)
     return

packages/botonic-plugin-flow-builder/src/content-fields/flow-carousel.tsx

@@ -202,6 +202,7 @@ export class FlowCarousel extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-channel-conditional.tsx

@@ -63,6 +63,7 @@ export class FlowChannelConditional extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
   }
 

packages/botonic-plugin-flow-builder/src/content-fields/flow-country-conditional.tsx

@@ -65,6 +65,7 @@ export class FlowCountryConditional extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-custom-conditional.tsx

@@ -115,6 +115,7 @@ export class FlowCustomConditional extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-go-to-flow.tsx

@@ -51,6 +51,7 @@ export class FlowGoToFlow extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-handoff.tsx

@@ -96,6 +96,7 @@ export class FlowHandoff extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.doHandoff(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-image.tsx

@@ -22,6 +22,7 @@ export class FlowImage extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-knowledge-base.tsx

@@ -38,6 +38,7 @@ export class FlowKnowledgeBase extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-queue-status-conditional.tsx

@@ -128,6 +128,7 @@ export class FlowQueueStatusConditional extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-rating.tsx

@@ -40,6 +40,7 @@ export class FlowRating extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-text.tsx

@@ -70,6 +70,7 @@ export class FlowText extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-video.tsx

@@ -22,6 +22,7 @@ export class FlowVideo extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-whatsapp-cta-url-button.tsx

@@ -119,6 +119,7 @@ export class FlowWhatsappCtaUrlButtonNode extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/content-fields/flow-whatsapp-template.tsx

@@ -274,6 +274,7 @@ export class FlowWhatsappTemplate extends ContentFieldsBase {
   }
 
   async processContent(botContext: BotContext): Promise<void> {
+    await this.filterContent(botContext, this)
     await this.trackFlow(botContext)
     return
   }

packages/botonic-plugin-flow-builder/src/filters/index.ts

@@ -2,7 +2,6 @@ import type { BotContext } from '@botonic/core'
 
 import type { FlowContent } from '../content-fields'
 import type { ContentFilter } from '../types'
-import { getFlowBuilderPlugin } from '../utils/get-flow-builder-plugin'
 
 interface ContentFilterExecutorOptions {
   filters: ContentFilter[]
@@ -26,22 +25,3 @@ export class ContentFilterExecutor {
     return content
   }
 }
-
-export async function filterContents(
-  request: BotContext,
-  contents: FlowContent[]
-): Promise<FlowContent[]> {
-  const flowBuilderPlugin = getFlowBuilderPlugin(request.plugins)
-  const contentFilters = flowBuilderPlugin.contentFilters
-  const contentFilterExecutor = new ContentFilterExecutor({
-    filters: contentFilters,
-  })
-
-  const filteredContents: FlowContent[] = []
-  for (const content of contents) {
-    const filteredContent = await contentFilterExecutor.filter(request, content)
-    filteredContents.push(filteredContent)
-  }
-
-  return filteredContents
-}