Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): keep assignees and gate access on update

Andrejf29477d7051f
diff --git a/apps/web/src/components/shared/modals/create-task-modal.tsx b/apps/web/src/components/shared/modals/create-task-modal.tsx
index 43aff8bdd..ff5fafe87 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.tsx
@@ -280,6 +280,17 @@ function CreateTaskModalContent({
workspaceId: workspace?.id || "",
projectId: resolvedProjectId,
});
+ const workspaceAssigneeOptions = useMemo(
+ () =>
+ (workspaceUsers?.members ?? []).map((member) => ({
+ id: member.userId,
+ name: member.user?.name ?? "",
+ image: member.user?.image ?? null,
+ })),
+ [workspaceUsers?.members],
+ );
+ const projectMembersPending =
+ Boolean(resolvedProjectId) && projectMembers === undefined;
const assigneeOptions = useMemo(
() =>
resolvedProjectId
@@ -288,16 +299,14 @@ function CreateTaskModalContent({
name: member.name,
image: member.image,
}))
- : (workspaceUsers?.members ?? []).map((member) => ({
- id: member.userId,
- name: member.user?.name ?? "",
- image: member.user?.image ?? null,
- })),
- [resolvedProjectId, projectMembers, workspaceUsers?.members],
- );
- const selectedUser = assigneeOptions.find(
- (option) => option.id === assigneeId,
+ : workspaceAssigneeOptions,
+ [resolvedProjectId, projectMembers, workspaceAssigneeOptions],
);
+ const selectedUser =
+ assigneeOptions.find((option) => option.id === assigneeId) ??
+ (projectMembersPending
+ ? workspaceAssigneeOptions.find((option) => option.id === assigneeId)
+ : undefined);
const {
data: projectColumns,
isError: columnsError,
diff --git a/apps/web/src/components/team/members-table.test.tsx b/apps/web/src/components/team/members-table.test.tsx
index 342fc68c2..7e6e2752e 100644
--- a/apps/web/src/components/team/members-table.test.tsx
+++ b/apps/web/src/components/team/members-table.test.tsx
@@ -101,6 +101,7 @@ const canInviteUsers = vi.fn(() => true);
vi.mock("@/hooks/use-workspace-permission", () => ({
useWorkspacePermission: () => ({
canManageTeam: () => true,
+ canUpdateMembers: () => true,
canRemoveMembers: () => true,
canInviteUsers: () => canInviteUsers(),
}),
diff --git a/apps/web/src/components/team/members-table.tsx b/apps/web/src/components/team/members-table.tsx
index 21a3a66dd..bbfb741f9 100644
--- a/apps/web/src/components/team/members-table.tsx
+++ b/apps/web/src/components/team/members-table.tsx
@@ -121,16 +121,17 @@ function MembersTable({ workspaceId, invitations, users }: Props) {
const { mutateAsync: updateMemberRole } = useUpdateWorkspaceUserRole();
const { copy: copyInvitationLink } = useCopyInvitationLink();
const { data: allWorkspaceRoles = [] } = useWorkspaceRoles(workspaceId);
- const { canManageTeam, canRemoveMembers, canInviteUsers } =
+ const { canManageTeam, canUpdateMembers, canRemoveMembers, canInviteUsers } =
useWorkspacePermission();
const canChangeRoles = Boolean(canManageTeam());
+ const canManageProjectAccess = Boolean(canUpdateMembers());
const canRemove = Boolean(canRemoveMembers());
const canInvite = Boolean(canInviteUsers());
const { data: projectAccessEntries } = useGetWorkspaceProjectAccess(
workspaceId,
- canChangeRoles,
+ canManageProjectAccess,
);
- const columnCount = canChangeRoles ? 5 : 4;
+ const columnCount = canManageProjectAccess ? 5 : 4;
const describeAccess = (access: ProjectAccessValue) =>
access.projectAccess === "all"
@@ -221,7 +222,7 @@ function MembersTable({ workspaceId, invitations, users }: Props) {
<TableHead className="text-foreground font-medium">
{t("team:membersTable.columns.role", { defaultValue: "Role" })}
</TableHead>
- {canChangeRoles ? (
+ {canManageProjectAccess ? (
<TableHead className="text-foreground font-medium">
{t("team:membersTable.columns.projects")}
</TableHead>
@@ -239,6 +240,8 @@ function MembersTable({ workspaceId, invitations, users }: Props) {
const isSelf = currentUser?.id === member.userId;
const showRoleSelect =
canChangeRoles && !isSelf && member.role !== "owner";
+ const showAccessEdit =
+ canManageProjectAccess && !isSelf && member.role !== "owner";
const access =
member.role === "owner"
? ALL_PROJECTS_ACCESS
@@ -327,11 +330,11 @@ function MembersTable({ workspaceId, invitations, users }: Props) {
</Badge>
)}
</TableCell>
- {canChangeRoles ? (
+ {canManageProjectAccess ? (
<TableCell className="py-3 text-sm text-muted-foreground">
{!projectAccessEntries ? (
"–"
- ) : showRoleSelect ? (
+ ) : showAccessEdit ? (
<Button
variant="ghost"
size="sm"
@@ -428,7 +431,7 @@ function MembersTable({ workspaceId, invitations, users }: Props) {
})}
</Badge>
</TableCell>
- {canChangeRoles ? (
+ {canManageProjectAccess ? (
<TableCell className="py-3 text-sm text-muted-foreground">
{describeAccess(getInvitationProjectAccess(invitation))}
</TableCell>
diff --git a/apps/web/src/hooks/use-workspace-permission.ts b/apps/web/src/hooks/use-workspace-permission.ts
index 32e08bf0e..1b8ab20d7 100644
--- a/apps/web/src/hooks/use-workspace-permission.ts
+++ b/apps/web/src/hooks/use-workspace-permission.ts
@@ -30,6 +30,7 @@ const CAPABILITIES = {
deleteWorkspace: { workspace: ["delete"] },
inviteUsers: { invitation: ["create"] },
manageTeam: { member: ["update", "delete"] },
+ updateMembers: { member: ["update"] },
removeMembers: { member: ["delete"] },
} as const satisfies Record<string, Record<string, string[]>>;
@@ -110,6 +111,7 @@ export function useWorkspacePermission() {
canDeleteWorkspace: () => can.deleteWorkspace,
canInviteUsers: () => can.inviteUsers,
canManageTeam: () => can.manageTeam,
+ canUpdateMembers: () => can.updateMembers,
canRemoveMembers: () => can.removeMembers,
// Escape hatch for ad-hoc permission checks (uncached). Prefer adding
// a capability above.