feat(fe): adjust

labring · Sep 18, 2024 · 39eb29b · 39eb29b
1 parent 381ee82
commit 39eb29b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/packages/service/support/permission/memberGroup/controllers.ts b/packages/service/support/permission/memberGroup/controllers.ts
@@ -6,21 +6,41 @@ import { MongoResourcePermission } from '../schema';
 import { getMaxGroupPer } from '../controller';
 import { MongoMemberGroupModel } from './memberGroupSchema';
 import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant';
+import { ClientSession } from 'mongoose';
 
-export const getDefaultGroupByTeamId = async (teamId: string) => {
-  const group = await MongoMemberGroupModel.findOne({
-    teamId,
-    name: DefaultGroupName
+/**
+ * Get the default group of a team
+ * @param{Object} obj
+ * @param{string} obj.teamId
+ * @param{ClientSession} obj.session
+ */
+
+export const getTeamDefaultGroup = async ({
+  teamId,
+  session
+}: {
+  teamId: string;
+  session?: ClientSession;
+}) => {
+  const group = await MongoMemberGroupModel.findOne({ teamId, name: DefaultGroupName }, undefined, {
+    session
   }).lean();
 
+  // Create the default group if it does not exist
   if (!group) {
-    return await MongoMemberGroupModel.create({
-      teamId,
-      name: DefaultGroupName,
-      avatar: ''
-    });
-  }
+    const [group] = await MongoMemberGroupModel.create(
+      [
+        {
+          teamId,
+          name: DefaultGroupName,
+          avatar: ''
+        }
+      ],
+      { session }
+    );
 
+    return group;
+  }
   return group;
 };
 
@@ -38,7 +58,7 @@ export const getGroupsByTmbId = async ({ tmbId, teamId }: { tmbId: string; teamI
           ...(item.groupId as any as MemberGroupSchemaType)
         };
       }),
-      await getDefaultGroupByTeamId(teamId)
+      await getTeamDefaultGroup({ teamId })
     ])
   ).flat();
 };

diff --git a/packages/service/support/user/team/controller.ts b/packages/service/support/user/team/controller.ts
@@ -15,7 +15,6 @@ import { TeamDefaultPermissionVal } from '@fastgpt/global/support/permission/use
 import { MongoMemberGroupModel } from '../../permission/memberGroup/memberGroupSchema';
 import { mongoSessionRun } from '../../../common/mongo/sessionRun';
 import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant';
-import { MongoGroupMemberModel } from '../../../support/permission/memberGroup/groupMemberSchema';
 
 async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemType> {
   const tmb = (await MongoTeamMember.findOne(match).populate('teamId')) as TeamMemberWithTeamSchema;
@@ -129,18 +128,7 @@ export async function createDefaultTeam({
       ],
       { session }
     );
-    // create default group member
-    await MongoGroupMemberModel.create(
-      [
-        {
-          groupId: tmb.teamId,
-          tmbId: tmb._id
-        }
-      ],
-      { session }
-    );
-
-    console.log('create default team', userId);
+    console.log('create default team and group', userId);
     return tmb;
   } else {
     console.log('default team exist', userId);

diff --git a/projects/app/src/components/support/user/team/TeamManageModal/components/GroupManage.tsx b/projects/app/src/components/support/user/team/TeamManageModal/components/GroupManage.tsx
@@ -15,7 +15,7 @@ import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/consta
 
 function MemberTable({ onEditGroup }: { onEditGroup: (groupId: string) => void }) {
   const { t } = useTranslation();
-  const { userInfo } = useUserStore();
+  const { userInfo, teamMembers } = useUserStore();
 
   const { ConfirmModal: ConfirmDeleteGroupModal, openConfirm: openDeleteGroupModal } = useConfirm({
     type: 'delete',
@@ -56,9 +56,11 @@ function MemberTable({ onEditGroup }: { onEditGroup: (groupId: string) => void }
                 </Td>
                 <Td>
                   <AvatarGroup
-                    avatars={group.members.map(
-                      (v) => members.find((m) => m.tmbId === v)?.avatar ?? ''
-                    )}
+                    avatars={
+                      group.name === DefaultGroupName
+                        ? teamMembers.map((v) => v.avatar)
+                        : group.members.map((v) => members.find((m) => m.tmbId === v)?.avatar ?? '')
+                    }
                     groupId={group._id}
                   />
                 </Td>

diff --git a/...pp/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx b/...pp/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx
@@ -189,7 +189,7 @@ function PermissionManage() {
               <MyTag key={group._id} px="4" py="2" type="fill" colorSchema="gray">
                 <Avatar src={group.avatar} w="1.25rem" />
                 <Box fontSize={'sm'} ml={1}>
-                  {group.name || userInfo?.team.teamName}
+                  {group.name === DefaultGroupName ? userInfo?.team.teamName : group.name}
                 </Box>
                 {userInfo?.team.role === 'owner' && (
                   <MyIcon