✅ test: Add test and fix some code review problems

lobehub · Jan 21, 2024 · 45f3536 · 45f3536
1 parent 330a1d8
commit 45f3536
Show file tree

Hide file tree

Showing 24 changed files with 393 additions and 244 deletions.
diff --git a/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx b/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx
@@ -4,11 +4,11 @@ import { createStyles } from 'antd-style';
 import {
   ChevronUp,
   CornerDownLeft,
-  Loader2,
   LucideCheck,
   LucideChevronDown,
   LucideCommand,
   LucidePlus,
+  StopCircle,
 } from 'lucide-react';
 import { rgba } from 'polished';
 import { memo } from 'react';
@@ -42,7 +42,7 @@ const useStyles = createStyles(({ css, prefixCls, token }) => {
 
       .${prefixCls}-btn.${prefixCls}-dropdown-trigger {
         &::before {
-          background-color: ${rgba(token.colorBgLayout, 0.05)} !important;
+          background-color: ${rgba(token.colorBgLayout, 0.1)} !important;
         }
       }
     `,
@@ -51,7 +51,7 @@ const useStyles = createStyles(({ css, prefixCls, token }) => {
 
 const isMac = isMacOS();
 
-const Footer = memo(() => {
+const Footer = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }) => {
   const { t } = useTranslation('chat');
 
   const { theme, styles } = useStyles();
@@ -111,12 +111,18 @@ const Footer = memo(() => {
         <SaveTopic />
         <Flexbox style={{ minWidth: 92 }}>
           {loading ? (
-            <Button icon={loading && <Icon icon={Loader2} spin />} onClick={stopGenerateMessage}>
+            <Button icon={loading && <Icon icon={StopCircle} />} onClick={stopGenerateMessage}>
               {t('input.stop')}
             </Button>
           ) : (
             <Space.Compact>
-              <Button onClick={() => sendMessage()} type={'primary'}>
+              <Button
+                onClick={() => {
+                  sendMessage();
+                  setExpand?.(false);
+                }}
+                type={'primary'}
+              >
                 {t('input.send')}
               </Button>
               <Dropdown

diff --git a/src/app/chat/(desktop)/features/ChatInput/index.tsx b/src/app/chat/(desktop)/features/ChatInput/index.tsx
@@ -46,7 +46,7 @@ const ChatInput = memo(() => {
       >
         <Head expand={expand} setExpand={setExpand} />
         <TextArea setExpand={setExpand} />
-        <Footer />
+        <Footer setExpand={setExpand} />
       </Flexbox>
     </DraggablePanel>
   );

diff --git a/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx b/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx
@@ -7,8 +7,8 @@ import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 
 const useStyles = createStyles(({ css }) => ({
   modalRoot: css`
@@ -25,7 +25,7 @@ const Actions = memo<ActionsProps>(({ id, openRenameModal, openConfigModal, onOp
   const { t } = useTranslation('common');
   const { styles } = useStyles();
   const { modal } = App.useApp();
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const items: MenuProps['items'] = useMemo(
     () => [

diff --git a/src/app/chat/features/SessionListContent/DefaultMode.tsx b/src/app/chat/features/SessionListContent/DefaultMode.tsx
@@ -4,7 +4,7 @@ import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { preferenceSelectors, settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
@@ -20,19 +20,16 @@ const SessionListContent = memo(() => {
   const [renameGroupModalOpen, setRenameGroupModalOpen] = useState(false);
   const [configGroupModalOpen, setConfigGroupModalOpen] = useState(false);
   const { t } = useTranslation('chat');
-
-  const [ useFetchSessions] = useSessionStore((s) => [
-    s.useFetchSessions,
-  ]);
-
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const sessionList =
     useSessionStore(sessionSelectors.sessionList(sessionCustomGroups), isEqual) || {};
   const [sessionGroupKeys, updatePreference] = useGlobalStore((s) => [
     preferenceSelectors.sessionGroupKeys(s),
     s.updatePreference,
   ]);
-
+  const [ useFetchSessions] = useSessionStore((s) => [
+    s.useFetchSessions,
+  ]);
   useFetchSessions();
 
 

diff --git a/src/app/chat/features/SessionListContent/List/Item/Actions.tsx b/src/app/chat/features/SessionListContent/List/Item/Actions.tsx
@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 
 import { configService } from '@/services/config';
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
 import { sessionSelectors } from '@/store/session/selectors';
@@ -42,7 +42,7 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
 
   const { styles } = useStyles();
 
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const [pin, removeSession, pinSession, duplicateSession, updateSessionGroup] = useSessionStore(
     (s) => {
       const session = sessionSelectors.getSessionById(id)(s);
@@ -86,14 +86,6 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
       },
       {
         children: [
-          {
-            icon: isDefault ? <Icon icon={Check} /> : <div />,
-            key: 'defaultList',
-            label: t('defaultList'),
-            onClick: () => {
-              updateSessionGroup(id, SessionDefaultGroup.Default);
-            },
-          },
           ...sessionCustomGroups.map(({ id: groupId, name }) => ({
             icon: group === groupId ? <Icon icon={Check} /> : <div />,
             key: groupId,
@@ -102,6 +94,14 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
               updateSessionGroup(id, groupId);
             },
           })),
+          {
+            icon: isDefault ? <Icon icon={Check} /> : <div />,
+            key: 'defaultList',
+            label: t('defaultList'),
+            onClick: () => {
+              updateSessionGroup(id, SessionDefaultGroup.Default);
+            },
+          },
           {
             type: 'divider',
           },

diff --git a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx
@@ -7,8 +7,8 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionGroupItem } from '@/types/session';
 
 const useStyles = createStyles(({ css }) => ({
@@ -27,7 +27,7 @@ const useStyles = createStyles(({ css }) => ({
 
 const GroupItem = memo<SessionGroupItem>(({ id, name }) => {
   const [editing, setEditing] = useState(false);
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const { t } = useTranslation('common');
   const { styles } = useStyles();

diff --git a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx
@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionGroupItem } from '@/types/session';
 
 import GroupItem from './GroupItem';
@@ -30,7 +30,7 @@ const useStyles = createStyles(({ css, token, stylish }) => ({
 const ConfigGroupModal = memo<ModalProps>(({ open, onCancel }) => {
   const { t } = useTranslation('common');
   const { styles } = useStyles();
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const [addCustomGroup, updateCustomGroup] = useGlobalStore((s) => [
     s.addCustomGroup,
     s.updateCustomGroup,

diff --git a/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx b/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx
@@ -5,7 +5,7 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 
 interface CreateGroupModalProps extends ModalProps {
@@ -15,7 +15,7 @@ interface CreateGroupModalProps extends ModalProps {
 const CreateGroupModal = memo<CreateGroupModalProps>(
   ({ id, open, onCancel }: CreateGroupModalProps) => {
     const { t } = useTranslation('common');
-    const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+    const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
     const addCustomGroup = useGlobalStore((s) => s.addCustomGroup);
     const updateSessionGroup = useSessionStore((s) => s.updateSessionGroup);
     const [input, setInput] = useState('');

diff --git a/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx b/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx
@@ -5,16 +5,16 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 
 interface RenameGroupModalProps extends ModalProps {
   id: string;
 }
 
 const RenameGroupModal = memo<RenameGroupModalProps>(({ id, open, onCancel }) => {
   const { t } = useTranslation('common');
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const group = groupHelpers.getGroupById(id, sessionCustomGroups);
   const [input, setInput] = useState<string>();

diff --git a/src/const/settings.ts b/src/const/settings.ts
@@ -15,6 +15,7 @@ export const DEFAULT_BASE_SETTINGS: GlobalBaseSettings = {
   fontSize: 14,
   language: 'auto',
   password: '',
+  sessionCustomGroups: [],
   themeMode: 'auto',
 };
 

diff --git a/src/database/models/__tests__/session.test.ts b/src/database/models/__tests__/session.test.ts
@@ -72,12 +72,12 @@ describe('SessionModel', () => {
 
   it('should update a session', async () => {
     const createdSession = await SessionModel.create('agent', sessionData);
-    const updateData = { group: 'createGroup' };
+    const updateData = { group: 'newGroup' };
 
     await SessionModel.update(createdSession.id, updateData);
     const updatedSession = await SessionModel.findById(createdSession.id);
 
-    expect(updatedSession).toHaveProperty('group', 'createGroup');
+    expect(updatedSession).toHaveProperty('group', 'newGroup');
   });
 
   // 删除一个 session 时，也需要同步删除具有 sessionId 的 topic 和 message

diff --git a/src/store/global/helpers.ts b/src/store/global/helpers.ts
@@ -7,4 +7,4 @@ export const globalHelpers = {
   getCurrentLanguage,
 };
 
-export * from './slices/common/helpers';
+export * from './slices/settings/helpers';
diff --git a/src/store/global/slices/common/action.ts b/src/store/global/slices/common/action.ts
@@ -8,7 +8,6 @@ import { SESSION_CHAT_URL } from '@/const/url';
 import { CURRENT_VERSION } from '@/const/version';
 import { globalService } from '@/services/global';
 import type { GlobalStore } from '@/store/global';
-import { SessionGroupItem } from '@/types/session';
 import type { GlobalServerConfig } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
@@ -22,8 +21,8 @@ const n = setNamespace('settings');
  * 设置操作
  */
 export interface CommonAction {
-  switchBackToChat: (sessionId?: string) => void;
   addCustomGroup: (name: string) => string;
+  switchBackToChat: (sessionId?: string) => void;
   /**
    * 切换侧边栏选项
    * @param key - 选中的侧边栏选项
@@ -32,7 +31,6 @@ export interface CommonAction {
   toggleChatSideBar: (visible?: boolean) => void;
   toggleMobileTopic: (visible?: boolean) => void;
   toggleSystemRole: (visible?: boolean) => void;
-  updateCustomGroup: (groups: SessionGroupItem[]) => void;
   updateGuideState: (guide: Partial<Guide>) => void;
   updatePreference: (preference: Partial<GlobalPreference>, action?: string) => void;
   useCheckLatestVersion: () => SWRResponse<string>;
@@ -45,9 +43,6 @@ export const createCommonSlice: StateCreator<
   [],
   CommonAction
 > = (set, get) => ({
-  switchBackToChat: (sessionId) => {
-    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
-  },
   addCustomGroup: (name) => {
     const sessionCustomGroups = get().preference.sessionCustomGroups || [];
 
@@ -63,6 +58,9 @@ export const createCommonSlice: StateCreator<
 
     return groupId;
   },
+  switchBackToChat: (sessionId) => {
+    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
+  },
   switchSideBar: (key) => {
     set({ sidebarKey: key }, false, n('switchSideBar', key));
   },
@@ -84,9 +82,6 @@ export const createCommonSlice: StateCreator<
 
     get().updatePreference({ showSystemRole }, n('toggleMobileTopic', newValue) as string);
   },
-  updateCustomGroup: (groups) => {
-    get().updatePreference({ sessionCustomGroups: groups });
-  },
   updateGuideState: (guide) => {
     const { updatePreference } = get();
     const nextGuide = merge(get().preference.guide, guide);

diff --git a/src/store/global/slices/common/initialState.ts b/src/store/global/slices/common/initialState.ts
@@ -1,7 +1,7 @@
-import { SessionGroupItem } from '@/types/session';
-
 import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
 
+import { SessionDefaultGroup, SessionGroupId, SessionGroupItem } from '@/types/session';
+
 export enum SidebarTabKey {
   Chat = 'chat',
   Market = 'market',
@@ -25,8 +25,9 @@ export interface GlobalPreference {
   inputHeight: number;
   mobileShowTopic?: boolean;
   sessionCustomGroups: SessionGroupItem[];
-  sessionGroupKeys: string[];
+  sessionGroupKeys: SessionGroupId[];
   sessionsWidth: number;
+
   showChatSideBar?: boolean;
   showSessionPanel?: boolean;
   showSystemRole?: boolean;
@@ -57,7 +58,7 @@ export const initialCommonState: GlobalCommonState = {
     inputHeight: 200,
     mobileShowTopic: false,
     sessionCustomGroups: [],
-    sessionGroupKeys: ['pinned', 'sessionList'],
+    sessionGroupKeys: [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default],
     sessionsWidth: 320,
     showChatSideBar: true,
     showSessionPanel: true,

diff --git a/src/store/global/slices/common/selectors.ts b/src/store/global/slices/common/selectors.ts
@@ -7,10 +7,7 @@ const sessionGroupKeys = (s: GlobalStore): string[] =>
 
 const useCmdEnterToSend = (s: GlobalStore): boolean => s.preference.useCmdEnterToSend || false;
 
-const sessionCustomGroups = (s: GlobalStore) => s.preference.sessionCustomGroups || [];
-
 export const preferenceSelectors = {
-  sessionCustomGroups,
   sessionGroupKeys,
   useCmdEnterToSend,
 };