Skip to content

Commit 662a4a4

Browse files
authored
fix: remove defaultTeam (labring#3989)
1 parent 3fadabd commit 662a4a4

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

packages/global/support/user/team/controller.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export type AuthTeamRoleProps = {
1010
export type CreateTeamProps = {
1111
name: string;
1212
avatar?: string;
13-
defaultTeam?: boolean;
1413
memberName?: string;
1514
memberAvatar?: string;
1615
notificationAccount?: string;

packages/global/support/user/team/type.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export type TeamMemberSchema = {
4747
role: `${TeamMemberRoleEnum}`;
4848
status: `${TeamMemberStatusEnum}`;
4949
avatar: string;
50-
defaultTeam: boolean;
5150
};
5251

5352
export type TeamMemberWithTeamAndUserSchema = TeamMemberSchema & {
@@ -65,7 +64,6 @@ export type TeamTmbItemType = {
6564
balance?: number;
6665
tmbId: string;
6766
teamDomain: string;
68-
defaultTeam: boolean;
6967
role: `${TeamMemberRoleEnum}`;
7068
status: `${TeamMemberStatusEnum}`;
7169
notificationAccount?: string;

packages/service/support/user/team/controller.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
4343
teamDomain: tmb.team?.teamDomain,
4444
role: tmb.role,
4545
status: tmb.status,
46-
defaultTeam: tmb.defaultTeam,
4746
permission: new TeamPermission({
4847
per: Per ?? TeamDefaultPermissionVal,
4948
isOwner: tmb.role === TeamMemberRoleEnum.owner
@@ -71,8 +70,7 @@ export async function getUserDefaultTeam({ userId }: { userId: string }) {
7170
return Promise.reject('tmbId or userId is required');
7271
}
7372
return getTeamMember({
74-
userId: new Types.ObjectId(userId),
75-
defaultTeam: true
73+
userId: new Types.ObjectId(userId)
7674
});
7775
}
7876

packages/service/support/user/team/teamMemberSchema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ const TeamMemberSchema = new Schema({
3939
updateTime: {
4040
type: Date
4141
},
42-
defaultTeam: {
43-
type: Boolean,
44-
default: false
45-
},
4642

4743
// Abandoned
4844
role: {
4945
type: String
46+
},
47+
// Abandoned
48+
defaultTeam: {
49+
type: Boolean
5050
}
5151
});
5252

projects/app/src/pageComponents/account/team/MemberTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
9393

9494
const { runAsync: onLeaveTeam } = useRequest2(
9595
async () => {
96-
const defaultTeam = myTeams.find((item) => item.defaultTeam) || myTeams[0];
96+
const defaultTeam = myTeams[0];
9797
// change to personal team
9898
onSwitchTeam(defaultTeam.teamId);
9999
return delLeaveTeam();

0 commit comments

Comments
 (0)