Merge remote-tracking branch 'upstream/main'

bentwnghk · Jan 29, 2024 · 9cdc928 · 9cdc928
2 parents e588dd9 + feeb589
commit 9cdc928
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 22 deletions.
diff --git a/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx b/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx
@@ -1,7 +1,7 @@
 import { ActionIcon, Icon } from '@bentwnghk/ui';
 import { App, Dropdown, DropdownProps, MenuProps } from 'antd';
 import { createStyles } from 'antd-style';
-import { MoreVertical, PencilLine, Settings2, Trash } from 'lucide-react';
+import { MoreVertical, PencilLine, Plus, Settings2, Trash } from 'lucide-react';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -15,19 +15,51 @@ const useStyles = createStyles(({ css }) => ({
 interface ActionsProps extends Pick<DropdownProps, 'onOpenChange'> {
   id?: string;
   isCustomGroup?: boolean;
+  isPinned?: boolean;
   openConfigModal: () => void;
   openRenameModal?: () => void;
 }
 
+type ItemOfType<T> = T extends (infer Item)[] ? Item : never;
+type MenuItemType = ItemOfType<MenuProps['items']>;
+
 const Actions = memo<ActionsProps>(
-  ({ id, openRenameModal, openConfigModal, onOpenChange, isCustomGroup }) => {
+  ({ id, openRenameModal, openConfigModal, onOpenChange, isCustomGroup, isPinned }) => {
     const { t } = useTranslation('chat');
     const { styles } = useStyles();
     const { modal } = App.useApp();
 
-    const [removeSessionGroup] = useSessionStore((s) => [s.removeSessionGroup]);
+    const [createSession, removeSessionGroup] = useSessionStore((s) => [
+      s.createSession,
+      s.removeSessionGroup,
+    ]);
+
+    const sessionGroupConfigPublicItem: MenuItemType = {
+      icon: <Icon icon={Settings2} />,
+      key: 'config',
+      label: t('sessionGroup.config'),
+      onClick: ({ domEvent }) => {
+        domEvent.stopPropagation();
+        openConfigModal();
+      },
+    };
+
+    const newAgentPublicItem: MenuItemType = {
+      icon: <Icon icon={Plus} />,
+      key: 'newAgent',
+      label: t('newAgent'),
+      onClick: ({ domEvent }) => {
+        domEvent.stopPropagation();
+        createSession({ group: id, pinned: isPinned });
+      },
+    };
+
     const customGroupItems: MenuProps['items'] = useMemo(
       () => [
+        newAgentPublicItem,
+        {
+          type: 'divider',
+        },
         {
           icon: <Icon icon={PencilLine} />,
           key: 'rename',
@@ -37,15 +69,7 @@ const Actions = memo<ActionsProps>(
             openRenameModal?.();
           },
         },
-        {
-          icon: <Icon icon={Settings2} />,
-          key: 'config',
-          label: t('sessionGroup.config'),
-          onClick: ({ domEvent }) => {
-            domEvent.stopPropagation();
-            openConfigModal();
-          },
-        },
+        sessionGroupConfigPublicItem,
         {
           type: 'divider',
         },
@@ -74,15 +98,11 @@ const Actions = memo<ActionsProps>(
 
     const defaultItems: MenuProps['items'] = useMemo(
       () => [
+        newAgentPublicItem,
         {
-          icon: <Icon icon={Settings2} />,
-          key: 'config',
-          label: t('sessionGroup.config'),
-          onClick: ({ domEvent }) => {
-            domEvent.stopPropagation();
-            openConfigModal();
-          },
+          type: 'divider',
         },
+        sessionGroupConfigPublicItem,
       ],
       [],
     );

diff --git a/src/app/chat/features/SessionListContent/DefaultMode.tsx b/src/app/chat/features/SessionListContent/DefaultMode.tsx
@@ -40,7 +40,7 @@ const SessionListContent = memo(() => {
       [
         pinnedSessions.length > 0 && {
           children: <SessionList dataSource={pinnedSessions} />,
-          extra: <Actions openConfigModal={() => setConfigGroupModalOpen(true)} />,
+          extra: <Actions isPinned openConfigModal={() => setConfigGroupModalOpen(true)} />,
           key: SessionDefaultGroup.Pinned,
           label: t('pin'),
         },

diff --git a/src/database/models/session.ts b/src/database/models/session.ts
@@ -23,7 +23,8 @@ class _SessionModel extends BaseModel {
 
   async create(type: 'agent' | 'group', defaultValue: Partial<LobeAgentSession>, id = uuid()) {
     const data = merge(DEFAULT_AGENT_LOBE_SESSION, { type, ...defaultValue });
-    return this._add(data, id);
+    const dataDB = this.mapToDB_Session(data);
+    return this._add(dataDB, id);
   }
 
   async batchCreate(sessions: LobeAgentSession[]) {

diff --git a/src/features/Conversation/Plugins/Inspector/index.tsx b/src/features/Conversation/Plugins/Inspector/index.tsx
@@ -118,7 +118,7 @@ const Inspector = memo<InspectorProps>(
                 label: t('debug.response'),
               },
             ]}
-            style={{ display: 'grid', maxWidth: 800 }}
+            style={{ display: 'grid', maxWidth: 800, minWidth: 400 }}
           />
         )}
       </Flexbox>