mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-22 12:20:34 +00:00
fix: remove defaultTeam (#3989)
This commit is contained in:
@@ -10,7 +10,6 @@ export type AuthTeamRoleProps = {
|
|||||||
export type CreateTeamProps = {
|
export type CreateTeamProps = {
|
||||||
name: string;
|
name: string;
|
||||||
avatar?: string;
|
avatar?: string;
|
||||||
defaultTeam?: boolean;
|
|
||||||
memberName?: string;
|
memberName?: string;
|
||||||
memberAvatar?: string;
|
memberAvatar?: string;
|
||||||
notificationAccount?: string;
|
notificationAccount?: string;
|
||||||
|
2
packages/global/support/user/team/type.d.ts
vendored
2
packages/global/support/user/team/type.d.ts
vendored
@@ -47,7 +47,6 @@ export type TeamMemberSchema = {
|
|||||||
role: `${TeamMemberRoleEnum}`;
|
role: `${TeamMemberRoleEnum}`;
|
||||||
status: `${TeamMemberStatusEnum}`;
|
status: `${TeamMemberStatusEnum}`;
|
||||||
avatar: string;
|
avatar: string;
|
||||||
defaultTeam: boolean;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export type TeamMemberWithTeamAndUserSchema = TeamMemberSchema & {
|
export type TeamMemberWithTeamAndUserSchema = TeamMemberSchema & {
|
||||||
@@ -65,7 +64,6 @@ export type TeamTmbItemType = {
|
|||||||
balance?: number;
|
balance?: number;
|
||||||
tmbId: string;
|
tmbId: string;
|
||||||
teamDomain: string;
|
teamDomain: string;
|
||||||
defaultTeam: boolean;
|
|
||||||
role: `${TeamMemberRoleEnum}`;
|
role: `${TeamMemberRoleEnum}`;
|
||||||
status: `${TeamMemberStatusEnum}`;
|
status: `${TeamMemberStatusEnum}`;
|
||||||
notificationAccount?: string;
|
notificationAccount?: string;
|
||||||
|
@@ -43,7 +43,6 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
|
|||||||
teamDomain: tmb.team?.teamDomain,
|
teamDomain: tmb.team?.teamDomain,
|
||||||
role: tmb.role,
|
role: tmb.role,
|
||||||
status: tmb.status,
|
status: tmb.status,
|
||||||
defaultTeam: tmb.defaultTeam,
|
|
||||||
permission: new TeamPermission({
|
permission: new TeamPermission({
|
||||||
per: Per ?? TeamDefaultPermissionVal,
|
per: Per ?? TeamDefaultPermissionVal,
|
||||||
isOwner: tmb.role === TeamMemberRoleEnum.owner
|
isOwner: tmb.role === TeamMemberRoleEnum.owner
|
||||||
@@ -71,8 +70,7 @@ export async function getUserDefaultTeam({ userId }: { userId: string }) {
|
|||||||
return Promise.reject('tmbId or userId is required');
|
return Promise.reject('tmbId or userId is required');
|
||||||
}
|
}
|
||||||
return getTeamMember({
|
return getTeamMember({
|
||||||
userId: new Types.ObjectId(userId),
|
userId: new Types.ObjectId(userId)
|
||||||
defaultTeam: true
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -39,14 +39,14 @@ const TeamMemberSchema = new Schema({
|
|||||||
updateTime: {
|
updateTime: {
|
||||||
type: Date
|
type: Date
|
||||||
},
|
},
|
||||||
defaultTeam: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false
|
|
||||||
},
|
|
||||||
|
|
||||||
// Abandoned
|
// Abandoned
|
||||||
role: {
|
role: {
|
||||||
type: String
|
type: String
|
||||||
|
},
|
||||||
|
// Abandoned
|
||||||
|
defaultTeam: {
|
||||||
|
type: Boolean
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -93,7 +93,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
|
|||||||
|
|
||||||
const { runAsync: onLeaveTeam } = useRequest2(
|
const { runAsync: onLeaveTeam } = useRequest2(
|
||||||
async () => {
|
async () => {
|
||||||
const defaultTeam = myTeams.find((item) => item.defaultTeam) || myTeams[0];
|
const defaultTeam = myTeams[0];
|
||||||
// change to personal team
|
// change to personal team
|
||||||
onSwitchTeam(defaultTeam.teamId);
|
onSwitchTeam(defaultTeam.teamId);
|
||||||
return delLeaveTeam();
|
return delLeaveTeam();
|
||||||
|
Reference in New Issue
Block a user