feat: update

Author: hi02102002

client/src/components/pages/flow-detail/node-dialog/message.tsx

@@ -113,15 +113,20 @@ export const MessageDialogContent = () => {
         </Select>
       </div>
       <div className='space-y-2'>
-        <Label required>{t('message_dialog.forms.bot_response.label')}</Label>
+        <Label required>{t('forms:bot_response.label')}</Label>
         {messageType === EMessageTypes.TEXT && (
-          <Input
-            placeholder={t('message_dialog.forms.bot_response.placeholder')}
-            value={botResponse}
-            onChange={(e) => {
-              setBotResponse(e.target.value)
-            }}
-          />
+          <>
+            <Input
+              placeholder={t('forms:bot_response.placeholder')}
+              value={botResponse}
+              onChange={(e) => {
+                setBotResponse(e.target.value)
+              }}
+            />
+            <p className='text-[0.8rem] text-muted-foreground'>
+              {t('forms:bot_response.description')}
+            </p>
+          </>
         )}
         {messageType === EMessageTypes.IMAGE && (
           <InputImage

client/src/locales/en/forms.json

@@ -142,6 +142,14 @@
       "required": "Please enter button label."
     }
   },
+  "bot_response": {
+    "label": "Bot Response",
+    "placeholder": "Type your bot response here",
+    "errors": {
+      "required": "Please enter bot response."
+    },
+    "description": "To access variable values, use {variable_name}, {variable_name->key}, {variable_name->0->key}, etc. {user->name} retrieves the 'name' key of the 'user' variable. For an array 'users' with an object at index 0 and a 'name' key, use {users->0->name}."
+  },
   "button_url": {
     "label": "Button URL",
     "placeholder": "Enter button URL",

client/src/locales/vi/forms.json

@@ -360,5 +360,13 @@
     "errors": {
       "required": "Vui lòng chọn biến đầu ra."
     }
+  },
+  "bot_response": {
+    "label": "Bot trả lời",
+    "placeholder": "Nhập câu trả lời của bot",
+    "errors": {
+      "required": "Vui lòng nhập câu trả lời của bot."
+    },
+    "description": "Để truy cập các giá trị biến, hãy sử dụng {variable_name}, {variable_name->key}, {variable_name->0->key}, v.v. {user->name} lấy khóa 'name' của biến 'user'. Đối với mảng 'người dùng' có đối tượng ở chỉ mục 0 và khóa 'tên', hãy sử dụng {users->0->name}."
   }
 }

server/src/constants/index.ts

@@ -39,6 +39,7 @@ export const ENDPOINTS = {
   SETTING: {
     INDEX: '/setting',
     MAIL: '/setting/email',
+    BY_CONTACT_ID: '/setting/by-contact-id/:contactId',
   },
   USER: {
     UPDATE_INFO: '/user/update-info',
@@ -59,7 +60,7 @@ export const ENDPOINTS = {
     ADD_CHANNELS: '/flow/add-channels',
     SELECT_FLOWS_FOR_CHANNEL: '/flow/select',
     BOT_GET_CONTACT_ID: '/bot/flow/:contactId',
-    BOT_GET_ID: '/bot/flow/:id'
+    BOT_GET_ID: '/bot/flow/:id',
   },
   INTENT: {
     INDEX: '/intent',

server/src/controllers/setting.controller.ts

@@ -7,8 +7,8 @@ import { StatusCodes } from 'http-status-codes'
 import Container from 'typedi'
 
 export class SettingController {
-  private settingService = Container.get(SettingService)
-  private localeService: LocaleService = Container.get(LOCALE_KEY)
+  private readonly settingService = Container.get(SettingService)
+  private readonly localeService: LocaleService = Container.get(LOCALE_KEY)
 
   public getSetting = catchAsync(async (req: RequestWithUser, res) => {
     const setting = await this.settingService.findByUserId(req.user.id)
@@ -29,4 +29,13 @@ export class SettingController {
       message: this.localeService.i18n().SETTING.UPDATE_EMAIL_SUCCESS(),
     })
   })
+
+  public getByContactId = catchAsync(async (req, res) => {
+    const setting = await this.settingService.findByContactId(
+      req.params.contactId,
+    )
+    res.status(StatusCodes.OK).json({
+      data: setting,
+    })
+  })
 }

server/src/dtos/bot-mail.dto.ts

@@ -1,4 +1,3 @@
-import { TTemplate } from '@/mail/send-mail'
 import { IsEmail, IsNotEmpty, IsObject, IsString } from 'class-validator'
 
 export class BotMailDto {
@@ -18,7 +17,7 @@ export class BotMailDto {
 
   @IsString()
   @IsNotEmpty()
-  template: TTemplate
+  template: string
 
   @IsObject()
   variables: Record<string, any>

server/src/mail/send-mail.ts

@@ -24,11 +24,13 @@ const MAP_TEMPLATES: TMapTemplates = {
 
 export type TTemplate = keyof TemplateProps
 
-export const sendMail = async <T extends keyof TemplateProps>(opts: {
+export const sendMail = async <
+  T extends keyof TemplateProps = keyof TemplateProps & string,
+>(opts: {
   to: string
   subject: string
   template: T
-  props: TemplateProps[T]
+  props: T extends keyof TemplateProps ? TemplateProps[T] : any
   from?: string
   user?: string
   pass?: string
@@ -43,7 +45,9 @@ export const sendMail = async <T extends keyof TemplateProps>(opts: {
     from = MAIL_USER,
   } = opts
   try {
-    const html = MAP_TEMPLATES[template](props)
+    const isNotInKey = !Object.keys(MAP_TEMPLATES).includes(template)
+
+    const html = isNotInKey ? template : MAP_TEMPLATES[template](props)
 
     const transporter = nodemailer.createTransport({
       service: 'gmail',

server/src/routes/setting.route.ts

@@ -29,5 +29,10 @@ export class SettingRoute implements Routes {
       authMiddleware,
       this.controller.updateEmailSetting,
     )
+
+    this.router.get(
+      ENDPOINTS.SETTING.BY_CONTACT_ID,
+      this.controller.getByContactId,
+    )
   }
 }

server/src/services/bot-mail.service.ts

@@ -30,7 +30,7 @@ export class BotMailService {
       to,
       props: variables as any,
       subject,
-      template,
+      template: template as any,
       pass: password,
       user: email,
     })

server/src/services/channels.service.ts

@@ -97,6 +97,7 @@ export class ChannelService {
         channelType: channelTypes.name,
         credentials: channels.credentials,
         flowId: channels.flowId,
+        userId: channels.userId,
       })
       .from(channels)
       .where(