+ {children} ); diff --git a/web/src/constants/common.ts b/web/src/constants/common.ts index 876647dcf..2c16044cc 100644 --- a/web/src/constants/common.ts +++ b/web/src/constants/common.ts @@ -41,6 +41,12 @@ export const fileIconMap = { export const LanguageList = ['English', 'Chinese', 'Traditional Chinese']; +export const LanguageMap = { + English: 'English', + Chinese: '简体中文', + 'Traditional Chinese': '繁體中文', +}; + export const LanguageTranslationMap = { English: 'en', Chinese: 'zh', diff --git a/web/src/constants/setting.ts b/web/src/constants/setting.ts index e27244ff0..e09dc4c9f 100644 --- a/web/src/constants/setting.ts +++ b/web/src/constants/setting.ts @@ -5,6 +5,7 @@ export enum UserSettingRouteKey { Password = 'password', Model = 'model', System = 'system', + Api = 'api', Team = 'team', Logout = 'logout', } diff --git a/web/src/hooks/chat-hooks.ts b/web/src/hooks/chat-hooks.ts index f9e89066a..00980a735 100644 --- a/web/src/hooks/chat-hooks.ts +++ b/web/src/hooks/chat-hooks.ts @@ -441,7 +441,7 @@ export const useRemoveNextToken = () => { mutationKey: ['removeToken'], mutationFn: async (params: { tenantId: string; - dialogId: string; + dialogId?: string; tokens: string[]; }) => { const { data } = await chatService.removeToken(params); diff --git a/web/src/hooks/user-setting-hooks.tsx b/web/src/hooks/user-setting-hooks.tsx index 688da7172..68cd9e482 100644 --- a/web/src/hooks/user-setting-hooks.tsx +++ b/web/src/hooks/user-setting-hooks.tsx @@ -1,5 +1,6 @@ import { LanguageTranslationMap } from '@/constants/common'; import { ResponseGetType } from '@/interfaces/database/base'; +import { IToken } from '@/interfaces/database/chat'; import { ITenantInfo } from '@/interfaces/database/knowledge'; import { ISystemStatus, IUserInfo } from '@/interfaces/database/user-setting'; import userService from '@/services/user-service'; @@ -152,3 +153,65 @@ export const useFetchSystemStatus = () => { loading, }; }; + +export const useFetchSystemTokenList = (params: Record) => { + const { + data, + isFetching: loading, + refetch, + } = useQuery({ + queryKey: ['fetchSystemTokenList', params], + initialData: [], + gcTime: 0, + queryFn: async () => { + const { data } = await userService.listToken(params); + + return data?.data ?? []; + }, + }); + + return { data, loading, refetch }; +}; + +export const useRemoveSystemToken = () => { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + + const { + data, + isPending: loading, + mutateAsync, + } = useMutation({ + mutationKey: ['removeSystemToken'], + mutationFn: async (token: string) => { + const { data } = await userService.removeToken({}, token); + if (data.retcode === 0) { + message.success(t('message.deleted')); + queryClient.invalidateQueries({ queryKey: ['fetchSystemTokenList'] }); + } + return data?.data ?? []; + }, + }); + + return { data, loading, removeToken: mutateAsync }; +}; + +export const useCreateSystemToken = () => { + const queryClient = useQueryClient(); + const { + data, + isPending: loading, + mutateAsync, + } = useMutation({ + mutationKey: ['createSystemToken'], + mutationFn: async (params: Record) => { + const { data } = await userService.createToken(params); + if (data.retcode === 0) { + queryClient.invalidateQueries({ queryKey: ['fetchSystemTokenList'] }); + } + return data?.data ?? []; + }, + }); + + return { data, loading, createToken: mutateAsync }; +}; diff --git a/web/src/layouts/components/right-toolbar/index.tsx b/web/src/layouts/components/right-toolbar/index.tsx index e636dfa84..267bc23c4 100644 --- a/web/src/layouts/components/right-toolbar/index.tsx +++ b/web/src/layouts/components/right-toolbar/index.tsx @@ -5,7 +5,7 @@ import camelCase from 'lodash/camelCase'; import React from 'react'; import User from '../user'; -import { LanguageList } from '@/constants/common'; +import { LanguageList, LanguageMap } from '@/constants/common'; import { useChangeLanguage } from '@/hooks/logic-hooks'; import { useFetchUserInfo } from '@/hooks/user-setting-hooks'; import styled from './index.less'; @@ -35,7 +35,7 @@ const RightToolBar = () => { const items: MenuProps['items'] = LanguageList.map((x) => ({ key: x, - label: {t(camelCase(x))}, + label: {LanguageMap[x as keyof typeof LanguageMap]}, })).reduce((pre, cur) => { return [...pre!, { type: 'divider' }, cur]; }, []); diff --git a/web/src/less/mixins.less b/web/src/less/mixins.less index a80a06935..7501bdbb2 100644 --- a/web/src/less/mixins.less +++ b/web/src/less/mixins.less @@ -1,3 +1,8 @@ +.tableCell() { + padding: 6px 13px; + border: 1px solid #d1d9e0; +} + .chunkText() { em { color: red; @@ -5,6 +10,8 @@ } table { width: 100%; + box-sizing: border-box; + border-collapse: collapse; } caption { @@ -17,8 +24,13 @@ } th { - color: #fff; - background-color: @blurBackground; + // color: #fff; + // background-color: @blurBackground; + .tableCell; + } + + td { + .tableCell; } td:hover { @@ -56,3 +68,10 @@ overflow: hidden; text-overflow: ellipsis; } + +.linkText() { + border-radius: 6px; + padding: 6px 10px; + background-color: #eff8ff; + border: 1px; +} diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index 48e40fb79..247e586db 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -400,7 +400,7 @@ The above is the content you need to summarize.`, quoteTip: 'Should the source of the original text be displayed?', selfRag: 'Self-RAG', selfRagTip: 'Please refer to: https://huggingface.co/papers/2310.11511', - overview: 'Chat Bot API', + overview: 'Chat ID', pv: 'Number of messages', uv: 'Active user number', speed: 'Token output speed', @@ -413,7 +413,7 @@ The above is the content you need to summarize.`, apiKey: 'API Key', apiReference: 'API Documents', dateRange: 'Date Range:', - backendServiceApi: 'Backend service API', + backendServiceApi: 'API Server', createNewKey: 'Create new key', created: 'Created', action: 'Action', @@ -451,6 +451,7 @@ The above is the content you need to summarize.`, team: 'Team', system: 'System', logout: 'Log out', + api: 'API', username: 'Username', usernameMessage: 'Please input your username!', photo: 'Your photo', diff --git a/web/src/locales/zh-traditional.ts b/web/src/locales/zh-traditional.ts index 67a8fca29..9b57dd75a 100644 --- a/web/src/locales/zh-traditional.ts +++ b/web/src/locales/zh-traditional.ts @@ -371,7 +371,7 @@ export default { quoteTip: '是否應該顯示原文出處？', selfRag: 'Self-RAG', selfRagTip: '請參考: https://huggingface.co/papers/2310.11511', - overview: '聊天 API', + overview: '聊天 ID', pv: '消息數', uv: '活躍用戶數', speed: 'Token 輸出速度', @@ -384,7 +384,7 @@ export default { apiKey: 'API 鍵', apiReference: 'API 文檔', dateRange: '日期範圍：', - backendServiceApi: '後端服務 API', + backendServiceApi: 'API 伺服器', createNewKey: '創建新密鑰', created: '創建於', action: '操作', diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts index f72d8512d..687cc9cd9 100644 --- a/web/src/locales/zh.ts +++ b/web/src/locales/zh.ts @@ -388,7 +388,7 @@ export default { quoteTip: '是否应该显示原文出处？', selfRag: 'Self-RAG', selfRagTip: '请参考: https://huggingface.co/papers/2310.11511', - overview: '聊天 API', + overview: '聊天 ID', pv: '消息数', uv: '活跃用户数', speed: 'Token 输出速度', @@ -401,7 +401,7 @@ export default { apiKey: 'API 键', apiReference: 'API 文档', dateRange: '日期范围：', - backendServiceApi: '后端服务 API', + backendServiceApi: 'API 服务器', createNewKey: '创建新密钥', created: '创建于', action: '操作', diff --git a/web/src/pages/api/index.tsx b/web/src/pages/api/index.tsx new file mode 100644 index 000000000..c41ef489f --- /dev/null +++ b/web/src/pages/api/index.tsx @@ -0,0 +1,11 @@ +import ApiContent from '@/components/api-service/chat-overview-modal/api-content'; + +const ApiPage = () => { + return ( + + + + ); +}; + +export default ApiPage; diff --git a/web/src/pages/chat/chat-id-modal/index.less b/web/src/pages/chat/chat-id-modal/index.less new file mode 100644 index 000000000..c95b34c95 --- /dev/null +++ b/web/src/pages/chat/chat-id-modal/index.less @@ -0,0 +1,3 @@ +.id { + .linkText(); +} diff --git a/web/src/pages/chat/chat-id-modal/index.tsx b/web/src/pages/chat/chat-id-modal/index.tsx new file mode 100644 index 000000000..9ea92a180 --- /dev/null +++ b/web/src/pages/chat/chat-id-modal/index.tsx @@ -0,0 +1,34 @@ +import { useTranslate } from '@/hooks/common-hooks'; +import { IModalProps } from '@/interfaces/common'; +import { Modal, Typography } from 'antd'; + +import styles from './index.less'; + +const { Paragraph } = Typography; + +const ChatIdModal = ({ + visible, + hideModal, + id, +}: IModalProps & { id: string; name?: string; idKey: string }) => { + const { t } = useTranslate('chat'); + + return ( + <> + + + {id} + + + + ); +}; + +export default ChatIdModal; diff --git a/web/src/pages/chat/index.tsx b/web/src/pages/chat/index.tsx index 3a87a8395..550a81381 100644 --- a/web/src/pages/chat/index.tsx +++ b/web/src/pages/chat/index.tsx @@ -1,6 +1,6 @@ import { ReactComponent as ChatAppCube } from '@/assets/svg/chat-app-cube.svg'; import RenameModal from '@/components/rename-modal'; -import { CloudOutlined, DeleteOutlined, EditOutlined } from '@ant-design/icons'; +import { DeleteOutlined, EditOutlined, KeyOutlined } from '@ant-design/icons'; import { Avatar, Button, @@ -29,7 +29,6 @@ import { useSelectDerivedConversationList, } from './hooks'; -import ChatOverviewModal from '@/components/api-service/chat-overview-modal'; import SvgIcon from '@/components/svg-icon'; import { useClickConversationCard, @@ -40,6 +39,7 @@ import { import { useSetModalState, useTranslate } from '@/hooks/common-hooks'; import { useSetSelectedRecord } from '@/hooks/logic-hooks'; import { IDialog } from '@/interfaces/database/chat'; +import ChatIdModal from './chat-id-modal'; import styles from './index.less'; const { Text } = Typography; @@ -190,7 +190,7 @@ const Chat = () => { onClick: handleShowOverviewModal(dialog), label: ( - + {t('overview')} ), @@ -367,13 +367,13 @@ const Chat = () => { loading={conversationRenameLoading} > {overviewVisible && ( - + > )} ); diff --git a/web/src/pages/user-setting/constants.tsx b/web/src/pages/user-setting/constants.tsx index e8360487e..1fa4c859e 100644 --- a/web/src/pages/user-setting/constants.tsx +++ b/web/src/pages/user-setting/constants.tsx @@ -1,3 +1,4 @@ +import { ReactComponent as ApiIcon } from '@/assets/svg/api.svg'; import { ReactComponent as LogoutIcon } from '@/assets/svg/logout.svg'; import { ReactComponent as ModelIcon } from '@/assets/svg/model-providers.svg'; import { ReactComponent as PasswordIcon } from '@/assets/svg/password.svg'; @@ -13,6 +14,7 @@ export const UserSettingIconMap = { [UserSettingRouteKey.System]: , [UserSettingRouteKey.Team]: , [UserSettingRouteKey.Logout]: , + [UserSettingRouteKey.Api]: , }; export * from '@/constants/setting'; diff --git a/web/src/pages/user-setting/setting-api/index.less b/web/src/pages/user-setting/setting-api/index.less new file mode 100644 index 000000000..772530dd9 --- /dev/null +++ b/web/src/pages/user-setting/setting-api/index.less @@ -0,0 +1,7 @@ +.apiWrapper { + width: 100%; + + div[class^='chartWrapper'] { + height: auto !important; + } +} diff --git a/web/src/pages/user-setting/setting-api/index.tsx b/web/src/pages/user-setting/setting-api/index.tsx new file mode 100644 index 000000000..8b07b8953 --- /dev/null +++ b/web/src/pages/user-setting/setting-api/index.tsx @@ -0,0 +1,13 @@ +import ApiContent from '@/components/api-service/chat-overview-modal/api-content'; + +import styles from './index.less'; + +const ApiPage = () => { + return ( + + + + ); +}; + +export default ApiPage; diff --git a/web/src/routes.ts b/web/src/routes.ts index eb1ed77b3..dfaec0b40 100644 --- a/web/src/routes.ts +++ b/web/src/routes.ts @@ -77,6 +77,10 @@ const routes = [ path: '/user-setting/system', component: '@/pages/user-setting/setting-system', }, + { + path: '/user-setting/api', + component: '@/pages/user-setting/setting-api', + }, ], }, { diff --git a/web/src/services/user-service.ts b/web/src/services/user-service.ts index f68f2d306..99617bae0 100644 --- a/web/src/services/user-service.ts +++ b/web/src/services/user-service.ts @@ -19,6 +19,9 @@ const { deleteFactory, getSystemStatus, getSystemVersion, + getSystemTokenList, + removeSystemToken, + createSystemToken, } = api; const methods = { @@ -86,6 +89,18 @@ const methods = { url: deleteFactory, method: 'post', }, + listToken: { + url: getSystemTokenList, + method: 'get', + }, + createToken: { + url: createSystemToken, + method: 'post', + }, + removeToken: { + url: removeSystemToken, + method: 'delete', + }, } as const; const userService = registerServer(methods, request); diff --git a/web/src/utils/api.ts b/web/src/utils/api.ts index 94e1a5840..99639f4b5 100644 --- a/web/src/utils/api.ts +++ b/web/src/utils/api.ts @@ -94,6 +94,10 @@ export default { // system getSystemVersion: `${api_host}/system/version`, getSystemStatus: `${api_host}/system/status`, + getSystemTokenList: `${api_host}/system/token_list`, + createSystemToken: `${api_host}/system/new_token`, + listSystemToken: `${api_host}/system/token_list`, + removeSystemToken: `${api_host}/system/token`, // flow listTemplates: `${api_host}/canvas/templates`,
{children}