diff --git a/packages/core/src/project/project.test.ts b/packages/core/src/project/project.test.ts index 8582814a..87318e0f 100644 --- a/packages/core/src/project/project.test.ts +++ b/packages/core/src/project/project.test.ts @@ -196,52 +196,42 @@ describe('ProjectService', () => { expect(allMembers).toHaveLength(2) }) - it('should include team-scoped members without explicit ProjectMember records', async () => { + it('should allow upserting custom role override for team-scoped members via updateMemberRole', async () => { const team = await prisma.team.create({ data: { name: 'Team Scope Test' } }) const project = await prisma.project.create({ data: { name: 'Project A', teamId: team.id } }) - const teamOwner = await prisma.user.create({ - data: { name: 'User A', email: `usera-${Date.now()}@example.com`, password: 'pw' }, - }) const teamEditor = await prisma.user.create({ data: { name: 'User B', email: `userb-${Date.now()}@example.com`, password: 'pw' }, }) - const projectEditor = await prisma.user.create({ - data: { name: 'User C', email: `userc-${Date.now()}@example.com`, password: 'pw' }, - }) - const tmA = await prisma.teamMember.create({ - data: { teamId: team.id, userId: teamOwner.id, role: 'owner', scope: 'team' }, - }) await prisma.teamMember.create({ data: { teamId: team.id, userId: teamEditor.id, role: 'editor', scope: 'team' }, }) - const tmC = await prisma.teamMember.create({ - data: { teamId: team.id, userId: projectEditor.id, role: 'reviewer', scope: 'project' }, - }) - // Only tmA and tmC are in ProjectMember for project A - await prisma.projectMember.create({ - data: { projectId: project.id, teamMemberId: tmA.id, role: 'owner' }, - }) - await prisma.projectMember.create({ - data: { projectId: project.id, teamMemberId: tmC.id, role: 'editor' }, - }) - - const members = await projectService.listProjectMembers({ + // Initially in listProjectMembers with default team role and hasCustomRole = false + const initialMembers = await projectService.listProjectMembers({ projectId: project.id, }) + expect(initialMembers).toHaveLength(1) + expect(initialMembers[0].id).toBe(teamEditor.id) + expect(initialMembers[0].role).toBe('editor') + expect(initialMembers[0].hasCustomRole).toBe(false) - expect(members).toHaveLength(3) - const memberIds = members.map((m) => m.id) - expect(memberIds).toContain(teamOwner.id) - expect(memberIds).toContain(teamEditor.id) - expect(memberIds).toContain(projectEditor.id) + // Set custom role for User B on project A + await projectService.updateMemberRole({ + projectId: project.id, + userId: teamEditor.id, + role: 'reviewer', + }) - // User B should have role 'editor' and scope 'team' - const userbInfo = members.find((m) => m.id === teamEditor.id) - expect(userbInfo?.role).toBe('editor') - expect(userbInfo?.scope).toBe('team') + // Now User B should have hasCustomRole = true and role = 'reviewer' + const updatedMembers = await projectService.listProjectMembers({ + projectId: project.id, + }) + expect(updatedMembers).toHaveLength(1) + expect(updatedMembers[0].id).toBe(teamEditor.id) + expect(updatedMembers[0].role).toBe('reviewer') + expect(updatedMembers[0].hasCustomRole).toBe(true) }) }) diff --git a/packages/core/src/project/project.ts b/packages/core/src/project/project.ts index f3271159..5b7d3855 100644 --- a/packages/core/src/project/project.ts +++ b/packages/core/src/project/project.ts @@ -270,6 +270,7 @@ export class ProjectService { user: (typeof projectMembers)[0]['teamMember']['user'] role: string scope: 'team' | 'project' + hasCustomRole: boolean } >() @@ -279,6 +280,7 @@ export class ProjectService { user: pm.teamMember.user, role: pm.role, scope: pm.teamMember.scope, + hasCustomRole: true, }) } } @@ -289,6 +291,7 @@ export class ProjectService { user: tm.user, role: tm.role, scope: tm.scope, + hasCustomRole: false, }) } } @@ -300,6 +303,7 @@ export class ProjectService { role: m.role as ProjectUserInfo['role'], image: await getAvatarUrl(m.user.image), scope: m.scope, + hasCustomRole: m.hasCustomRole, })), ) } @@ -380,6 +384,12 @@ export class ProjectService { } async updateMemberRole(req: ServiceUpdateProjectMemberRoleRequest): Promise { + const project = await prisma.project.findUnique({ + where: { id: req.projectId }, + select: { teamId: true }, + }) + if (!project) throw new Error('Project not found') + const member = await prisma.projectMember.findFirst({ where: { projectId: req.projectId, @@ -389,13 +399,31 @@ export class ProjectService { }, }) - if (!member) throw new Error('Member not found') - if (member.role === 'owner') throw new Error('Cannot change the role of an owner') - - await prisma.projectMember.update({ - where: { id: member.id }, - data: { role: req.role }, - }) + if (member) { + if (member.role === 'owner') throw new Error('Cannot change the role of an owner') + await prisma.projectMember.update({ + where: { id: member.id }, + data: { role: req.role }, + }) + } else { + const tm = await prisma.teamMember.findUnique({ + where: { + teamIdUserId: { + teamId: project.teamId, + userId: req.userId, + }, + }, + }) + if (!tm) throw new Error('Member not found') + await prisma.projectMember.create({ + data: { + projectId: req.projectId, + teamMemberId: tm.id, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + role: req.role as any, + }, + }) + } } async removeMember(projectId: string, userId: string): Promise { diff --git a/packages/dtos/src/project.ts b/packages/dtos/src/project.ts index a89d1622..6c41186f 100644 --- a/packages/dtos/src/project.ts +++ b/packages/dtos/src/project.ts @@ -50,6 +50,7 @@ export const projectUserInfoSchema = z.object({ role: z.enum(['owner', 'editor', 'reviewer', 'bot', 'unknown']), image: z.string().optional(), scope: z.enum(['team', 'project']).optional(), + hasCustomRole: z.boolean().optional(), }) export type ProjectUserInfo = z.infer diff --git a/packages/webui/components/members-dialog.tsx b/packages/webui/components/members-dialog.tsx index e8cd93f8..70afaa99 100644 --- a/packages/webui/components/members-dialog.tsx +++ b/packages/webui/components/members-dialog.tsx @@ -31,6 +31,7 @@ export interface Member { role?: string image?: string scope?: 'team' | 'project' + hasCustomRole?: boolean } interface MembersDialogProps { @@ -164,6 +165,22 @@ export function MembersDialog({ } const safeMembers = Array.isArray(members) ? members : [] + const safeAvailableMembers = Array.isArray(availableMembersToAdd) ? availableMembersToAdd : [] + + const topMembers = + type === 'project' + ? safeMembers.filter((m) => m.role === 'owner' || m.scope === 'project' || m.hasCustomRole) + : safeMembers + + const teamMembersToCustomize = + type === 'project' + ? safeMembers.filter((m) => m.scope === 'team' && m.role !== 'owner' && !m.hasCustomRole) + : [] + + const otherProjectMembersToAdd = + type === 'project' + ? safeAvailableMembers.filter((m) => m.scope === 'project') + : safeAvailableMembers return ( @@ -173,7 +190,7 @@ export function MembersDialog({
- {safeMembers.map((member) => ( + {topMembers.map((member) => (
{' '} - {isOwner && onAddMember && availableMembersToAdd && availableMembersToAdd.length > 0 && ( + {isOwner && onAddMember && teamMembersToCustomize.length > 0 && (

{m.add_team_member_to_project()}

{m.add_team_member_to_project_hint()}

- {availableMembersToAdd.map((member) => { + {teamMembersToCustomize.map((member) => { const currentRole = rolesToAdd[member.id!] || 'editor' return (
)} + {isOwner && onAddMember && otherProjectMembersToAdd.length > 0 && ( +
+

{m.add_members_from_other_projects()}

+

+ {m.add_members_from_other_projects_hint()} +

+
+ {otherProjectMembersToAdd.map((member) => { + const currentRole = rolesToAdd[member.id!] || 'editor' + return ( +
+
+ + {member.image && ( + + )} + {getInitials(member.name)} + +
+ {member.name} + + {member.scope === 'team' ? m.team_member() : m.project_member()} + +
+
+ +
+ + + + + + + setRoleToAdd(member.id!, v as 'editor' | 'reviewer') + } + > + + {m.editor()} + + + {m.reviewer()} + + + + + + +
+
+ ) + })} +
+
+ )} {isOwner && onInvite && (

{m.invite_new_member()}

diff --git a/packages/webui/messages/en.json b/packages/webui/messages/en.json index f78d968c..2e4057f3 100644 --- a/packages/webui/messages/en.json +++ b/packages/webui/messages/en.json @@ -626,6 +626,9 @@ "add_team_member_to_project": "Customize Team Member Role", "add_team_member_to_project_hint": "Team members already have access to all projects with their default team role. Set a custom role for this specific project here.", "set_role": "Set Role", + "add_members_from_other_projects": "Add Members from Other Projects", + "add_members_from_other_projects_hint": "Project-scoped members who currently do not have access to this project.", + "add_to_project": "Add to Project", "added_member_successfully": "Added {name} successfully", "failed_to_add_member": "Failed to add {name}", "invite_new_member": "Invite New Member", diff --git a/packages/webui/messages/zh.json b/packages/webui/messages/zh.json index 0ec8140e..46ab4c09 100644 --- a/packages/webui/messages/zh.json +++ b/packages/webui/messages/zh.json @@ -626,6 +626,9 @@ "add_team_member_to_project": "自定义团队成员在项目的角色", "add_team_member_to_project_hint": "团队成员默认使用其团队角色访问所有项目。您可以在此为其设置独立的项目角色。", "set_role": "设置角色", + "add_members_from_other_projects": "从其他项目添加成员", + "add_members_from_other_projects_hint": "当前无权访问此项目的项目成员。", + "add_to_project": "添加到项目", "added_member_successfully": "已成功添加 {name}", "failed_to_add_member": "添加 {name} 失败", "invite_new_member": "邀请新成员", diff --git a/packages/webui/paraglide/messages/_index.d.ts b/packages/webui/paraglide/messages/_index.d.ts index b1c17882..0b3985f2 100644 --- a/packages/webui/paraglide/messages/_index.d.ts +++ b/packages/webui/paraglide/messages/_index.d.ts @@ -589,6 +589,9 @@ export * from "./invite_link_copied.js"; export * from "./add_team_member_to_project.js"; export * from "./add_team_member_to_project_hint.js"; export * from "./set_role.js"; +export * from "./add_members_from_other_projects.js"; +export * from "./add_members_from_other_projects_hint.js"; +export * from "./add_to_project.js"; export * from "./added_member_successfully.js"; export * from "./failed_to_add_member.js"; export * from "./invite_new_member.js"; diff --git a/packages/webui/paraglide/messages/_index.js b/packages/webui/paraglide/messages/_index.js index 8eec6664..b1701435 100644 --- a/packages/webui/paraglide/messages/_index.js +++ b/packages/webui/paraglide/messages/_index.js @@ -591,6 +591,9 @@ export * from './invite_link_copied.js' export * from './add_team_member_to_project.js' export * from './add_team_member_to_project_hint.js' export * from './set_role.js' +export * from './add_members_from_other_projects.js' +export * from './add_members_from_other_projects_hint.js' +export * from './add_to_project.js' export * from './added_member_successfully.js' export * from './failed_to_add_member.js' export * from './invite_new_member.js' diff --git a/packages/webui/paraglide/messages/add_members_from_other_projects.d.ts b/packages/webui/paraglide/messages/add_members_from_other_projects.d.ts new file mode 100644 index 00000000..e0b5d2b9 --- /dev/null +++ b/packages/webui/paraglide/messages/add_members_from_other_projects.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Add Members from Other Projects" | +* +* @param {Add_Members_From_Other_ProjectsInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_members_from_other_projects: ((inputs?: Add_Members_From_Other_ProjectsInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Add_Members_From_Other_ProjectsInputs = {}; diff --git a/packages/webui/paraglide/messages/add_members_from_other_projects.js b/packages/webui/paraglide/messages/add_members_from_other_projects.js new file mode 100644 index 00000000..09e31b0d --- /dev/null +++ b/packages/webui/paraglide/messages/add_members_from_other_projects.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Add_Members_From_Other_ProjectsInputs */ + +const en_add_members_from_other_projects = /** @type {(inputs: Add_Members_From_Other_ProjectsInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Add Members from Other Projects`) +}; + +const zh_add_members_from_other_projects = /** @type {(inputs: Add_Members_From_Other_ProjectsInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`从其他项目添加成员`) +}; + +/** +* | output | +* | --- | +* | "Add Members from Other Projects" | +* +* @param {Add_Members_From_Other_ProjectsInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_members_from_other_projects = /** @type {((inputs?: Add_Members_From_Other_ProjectsInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_add_members_from_other_projects(inputs) + return zh_add_members_from_other_projects(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/add_members_from_other_projects_hint.d.ts b/packages/webui/paraglide/messages/add_members_from_other_projects_hint.d.ts new file mode 100644 index 00000000..c9809921 --- /dev/null +++ b/packages/webui/paraglide/messages/add_members_from_other_projects_hint.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Project-scoped members who currently do not have access to this project." | +* +* @param {Add_Members_From_Other_Projects_HintInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_members_from_other_projects_hint: ((inputs?: Add_Members_From_Other_Projects_HintInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Add_Members_From_Other_Projects_HintInputs = {}; diff --git a/packages/webui/paraglide/messages/add_members_from_other_projects_hint.js b/packages/webui/paraglide/messages/add_members_from_other_projects_hint.js new file mode 100644 index 00000000..e477a9e8 --- /dev/null +++ b/packages/webui/paraglide/messages/add_members_from_other_projects_hint.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Add_Members_From_Other_Projects_HintInputs */ + +const en_add_members_from_other_projects_hint = /** @type {(inputs: Add_Members_From_Other_Projects_HintInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Project-scoped members who currently do not have access to this project.`) +}; + +const zh_add_members_from_other_projects_hint = /** @type {(inputs: Add_Members_From_Other_Projects_HintInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`当前无权访问此项目的项目成员。`) +}; + +/** +* | output | +* | --- | +* | "Project-scoped members who currently do not have access to this project." | +* +* @param {Add_Members_From_Other_Projects_HintInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_members_from_other_projects_hint = /** @type {((inputs?: Add_Members_From_Other_Projects_HintInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_add_members_from_other_projects_hint(inputs) + return zh_add_members_from_other_projects_hint(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/add_to_project.d.ts b/packages/webui/paraglide/messages/add_to_project.d.ts new file mode 100644 index 00000000..40c12d42 --- /dev/null +++ b/packages/webui/paraglide/messages/add_to_project.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Add to Project" | +* +* @param {Add_To_ProjectInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_to_project: ((inputs?: Add_To_ProjectInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Add_To_ProjectInputs = {}; diff --git a/packages/webui/paraglide/messages/add_to_project.js b/packages/webui/paraglide/messages/add_to_project.js new file mode 100644 index 00000000..2f035171 --- /dev/null +++ b/packages/webui/paraglide/messages/add_to_project.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Add_To_ProjectInputs */ + +const en_add_to_project = /** @type {(inputs: Add_To_ProjectInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Add to Project`) +}; + +const zh_add_to_project = /** @type {(inputs: Add_To_ProjectInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`添加到项目`) +}; + +/** +* | output | +* | --- | +* | "Add to Project" | +* +* @param {Add_To_ProjectInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const add_to_project = /** @type {((inputs?: Add_To_ProjectInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_add_to_project(inputs) + return zh_add_to_project(inputs) +}); \ No newline at end of file