Merge pull request #35 from Dialogue-Bot/DIAL-32-ui-chat-bot

feat: update

Author: hi02102002

client/src/pages/chatbot-detail.tsx

@@ -6,7 +6,7 @@ import {
 import { Edge } from '@/components/pages/chatbot-detail/edge'
 import { Toolbar } from '@/components/pages/chatbot-detail/toolbar'
 import { queryFlowDetailOption } from '@/lib/query-options/flow'
-import { ENodeTypes } from '@/types/flow'
+import { EActionTypes } from '@/types/flow'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useCallback } from 'react'
 import { useParams } from 'react-router-dom'
@@ -29,19 +29,19 @@ const ChatBotDetail = () => {
   const [nodes, _setNodes, onNodesChange] = useNodesState([
     {
       id: '1',
-      type: ENodeTypes.START,
+      type: EActionTypes.START,
       position: { x: 100, y: 100 },
       data: { label: 'Start' },
     },
     {
       id: '2',
-      type: ENodeTypes.MESSAGE,
+      type: EActionTypes.MESSAGE,
       position: { x: 250, y: 100 },
       data: { label: 'Message' },
     },
     {
       id: '3',
-      type: ENodeTypes.MESSAGE,
+      type: EActionTypes.MESSAGE,
       position: { x: 250, y: 100 },
       data: { label: 'Message' },
     },

client/src/types/flow.ts

@@ -1,16 +1,14 @@
-export enum ENodeTypes {
+export enum EActionTypes {
   START = 'start',
-  END = 'end',
-  ACTION = 'action',
-  CONDITION = 'condition',
   MESSAGE = 'message',
-  QUESTION = 'question',
-  ANSWER = 'answer',
-  OPTION = 'option',
-  FORM = 'form',
+  PROMPT_AND_COLLECT = 'prompt-and-collect',
+  CHECK_ATTRIBUTE = 'check-attribute',
+  SEND_MAIL = 'send-mail',
+  HTTP_REQUEST = 'http-request',
+  SUB_FLOW = 'sub-flow',
 }
 
-export type TNodeTypes = Partial<Record<ENodeTypes, () => JSX.Element>>
+export type TNodeTypes = Partial<Record<EActionTypes, () => JSX.Element>>
 
 export type TFLow = {
   id: string

server/src/controllers/flows.controller.ts

@@ -66,14 +66,13 @@ export class FlowController {
     res.status(StatusCodes.OK).json({ data })
   })
 
-  public selectFlowsForChannel = catchAsync(
-    async (req: RequestWithUser, res) => {
-      const data = await this.flowService.selectFlowsForChannel(
-        req.user?.id as string,
-      )
-      res.status(StatusCodes.OK).json({ data })
-    },
-  )
+  public getFlowsForSelect = catchAsync(async (req: RequestWithUser, res) => {
+    console.log('req.query.channelId', req.query.channelId)
+    const data = await this.flowService.getFlowsForSelect(
+      req.user?.id as string,
+    )
+    res.status(StatusCodes.OK).json({ data })
+  })
 
   public getFlowByContactId = catchAsync(async (req: RequestWithUser, res) => {
     const data = await this.flowService.getFlowByContactId(req.params.contactId)

server/src/dtos/flows.dto.ts

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 import { getCurrentLocale } from '@/i18n/get-current'
 import { IFlowSetting, IFlowVariable } from '@/interfaces/flows.interface'
 import { Transform } from 'class-transformer'
-=======
-import { getCurrentLocale } from '@/i18n/get-current';
-import { IFlowSetting, IFlowVariable } from '@/interfaces/flows.interface';
-import { Transform } from 'class-transformer';
->>>>>>> origin/main
 import {
   IsArray,
   IsNotEmpty,

server/src/routes/flow.route.ts

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { ENDPOINTS } from '@/constants'
 import { FlowController } from '@/controllers/flows.controller'
 import { FlowDTO } from '@/dtos/flows.dto'
@@ -7,16 +6,6 @@ import { authMiddleware } from '@/middlewares/auth.middleware'
 import { validate } from '@/middlewares/validation.middleware'
 import type { Routes } from '@interfaces/routes.interface'
 import { Router } from 'express'
-=======
-import { ENDPOINTS } from '@/constants';
-import { FlowController } from '@/controllers/flows.controller';
-import { FlowDTO } from '@/dtos/flows.dto';
-import { PagingDTO } from '@/dtos/paging.dto';
-import { authMiddleware } from '@/middlewares/auth.middleware';
-import { validate } from '@/middlewares/validation.middleware';
-import type { Routes } from '@interfaces/routes.interface';
-import { Router } from 'express';
->>>>>>> origin/main
 
 export class FlowRoute implements Routes {
   public router: Router = Router()

server/src/services/flows.service.ts

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { LOCALE_KEY } from '@/constants'
 import { db } from '@/database/db'
 import { channels, flows } from '@/database/schema'
@@ -33,30 +32,6 @@ export class FlowService {
     @Inject(LOCALE_KEY) private readonly localeService: LocaleService,
     private readonly chanelService: ChannelService,
   ) {}
-=======
-import { LOCALE_KEY } from '@/constants';
-import { db } from '@/database/db';
-import { channels, flows } from '@/database/schema';
-import { TNewFlow } from '@/database/types';
-import { FlowDTO } from '@/dtos/flows.dto';
-import { PagingDTO } from '@/dtos/paging.dto';
-import { HttpException } from '@/exceptions/http-exception';
-import { LocaleService } from '@/i18n/ctx';
-import { FlowExtend } from '@/interfaces/flows.interface';
-import { Paging } from '@/interfaces/paging.interface';
-import { and, asc, desc, eq, isNotNull, like, ne, notExists, sql } from 'drizzle-orm';
-import { StatusCodes } from 'http-status-codes';
-import { omit } from 'lodash';
-import { Inject, Service } from 'typedi';
-import { ChannelService } from './channels.service';
-
-@Service()
-export class FlowService {
-   constructor(
-      @Inject(LOCALE_KEY) private readonly localeService: LocaleService,
-      private readonly chanelService: ChannelService
-   ) { }
->>>>>>> origin/main
 
   public async create(fields: TNewFlow) {
     const flowExisted = await db.query.flows.findFirst({