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: refresh assignee lists when access changes

Andrej38eeeaa8efdb
diff --git a/apps/api/src/project-access/list-workspace-project-ids.ts b/apps/api/src/project-access/list-workspace-project-ids.ts
new file mode 100644
index 000000000..4c5393916
--- /dev/null
+++ b/apps/api/src/project-access/list-workspace-project-ids.ts
@@ -0,0 +1,12 @@
+import { eq } from "drizzle-orm";
+import db, { schema } from "../database";
+
+export async function listWorkspaceProjectIds(
+ workspaceId: string,
+): Promise<string[]> {
+ const rows = await db
+ .select({ id: schema.projectTable.id })
+ .from(schema.projectTable)
+ .where(eq(schema.projectTable.workspaceId, workspaceId));
+ return rows.map((row) => row.id);
+}
diff --git a/apps/api/src/ws/index.ts b/apps/api/src/ws/index.ts
index a60616661..5fbab8cfa 100644
--- a/apps/api/src/ws/index.ts
+++ b/apps/api/src/ws/index.ts
@@ -12,6 +12,7 @@ import {
import { subscribeToEvent } from "../events";
import { findInaccessibleProjectIds } from "../project-access/find-inaccessible-project-ids";
import { filterUsersWithProjectAccess } from "../project-access/filter-users-with-project-access";
+import { listWorkspaceProjectIds } from "../project-access/list-workspace-project-ids";
import {
hasInstanceAdminRole,
instanceAdminRoleSql,
@@ -797,6 +798,11 @@ subscribeToEvent<{ workspaceId: string; userId: string }>(
const message = { type: "PROJECT_ACCESS_CHANGED", workspaceId };
deliverToLocalUserConnections(userId, message);
await revocationDelivery?.send({ userId, message, origin: INSTANCE_ID });
+ for (const projectId of await listWorkspaceProjectIds(workspaceId))
+ broadcastToProject(projectId, {
+ type: "PROJECT_MEMBERS_UPDATED",
+ projectId,
+ });
},
);
diff --git a/apps/web/src/hooks/use-project-websocket.ts b/apps/web/src/hooks/use-project-websocket.ts
index 277cad678..10a287716 100644
--- a/apps/web/src/hooks/use-project-websocket.ts
+++ b/apps/web/src/hooks/use-project-websocket.ts
@@ -188,6 +188,15 @@ export function useProjectWebSocket(projectId: string) {
if (disposed || activeSocket !== ws) return;
try {
const message = JSON.parse(event.data);
+ if (message.type === "PROJECT_MEMBERS_UPDATED") {
+ void queryClient.invalidateQueries({
+ predicate: (query) =>
+ query.queryKey[0] === "workspace-users" &&
+ query.queryKey[2] === "project" &&
+ query.queryKey[3] === projectId,
+ });
+ return;
+ }
if (
message.taskId &&
[
diff --git a/apps/web/src/hooks/use-user-websocket.ts b/apps/web/src/hooks/use-user-websocket.ts
index 437f19962..b55cb7877 100644
--- a/apps/web/src/hooks/use-user-websocket.ts
+++ b/apps/web/src/hooks/use-user-websocket.ts
@@ -150,6 +150,7 @@ export function useUserWebSocket() {
["assigned-tasks", workspaceId],
["search", { workspaceId }],
["workspace-activity", workspaceId],
+ ["labels", workspaceId],
["notifications"],
])
void queryClient.invalidateQueries({ queryKey });
diff --git a/tests/api/ws/project-move.test.ts b/tests/api/ws/project-move.test.ts
index 8ab2752e3..26ee49c37 100644
--- a/tests/api/ws/project-move.test.ts
+++ b/tests/api/ws/project-move.test.ts
@@ -73,6 +73,10 @@ vi.mock(
findInaccessibleProjectIds: m.inaccessible,
}),
);
+vi.mock(
+ "../../../apps/api/src/project-access/list-workspace-project-ids",
+ () => ({ listWorkspaceProjectIds: async () => [] }),
+);
const projectAccessUpdated = vi
.mocked(subscribeToEvent)
.mock.calls.find(([eventName]) => eventName === "project_access.updated")![1];