Skip to content

Commit 9226fff

Browse files
authored
Merge branch 'main' into fix/repository-channel-stomp-routing
2 parents 7aa0e80 + fb16977 commit 9226fff

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/app/api/workspace.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export type WorkspaceMember = {
4848
username: string;
4949
email: string;
5050
role: string;
51+
position?: string | null;
5152
joinedAt: string;
5253
presence: string;
5354
};
@@ -97,6 +98,7 @@ export function transferOwnership(workspaceId: number, memberId: number): Promis
9798
export type InviteCreatePayload = {
9899
email: string;
99100
role: string;
101+
position?: string;
100102
expiresInHours: number;
101103
};
102104

src/app/components/WorkspaceSettingsModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ function MembersTab({ org, isAdmin, isOwner, onUpdate }: {
638638
id: String(m.memberId),
639639
initials: m.username.slice(0, 2),
640640
name: m.username,
641-
role: "멤버",
641+
role: m.position || "멤버",
642642
permissionRole: AUTHORITY_EN_TO_KO[m.role] ?? "편집 가능",
643643
email: m.email ?? "",
644644
online: m.presence ? m.presence !== "offline" : false,
@@ -744,7 +744,7 @@ function MembersTab({ org, isAdmin, isOwner, onUpdate }: {
744744
if (toInvite.length === 0) return;
745745
void Promise.allSettled(
746746
toInvite.map((d) =>
747-
createInvite(org.id, { email: d.email, role: "viewer", expiresInHours: 168 })
747+
createInvite(org.id, { email: d.email, role: "viewer", position: d.role, expiresInHours: 168 })
748748
)
749749
).then((results) => {
750750
const failed = results.filter((r) => r.status === "rejected").length;

0 commit comments

Comments
 (0)