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): wait for the caller access in dialogs

Andrej41ea8cb67b26
diff --git a/apps/web/src/components/team/invite-team-member-modal.test.tsx b/apps/web/src/components/team/invite-team-member-modal.test.tsx
index fd93af91c..0ada74fc0 100644
--- a/apps/web/src/components/team/invite-team-member-modal.test.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.test.tsx
@@ -50,6 +50,14 @@ vi.mock("@/hooks/queries/project/use-get-projects", () => ({
isLoading: false,
}),
}));
+const myAccess = vi.fn(() => ({
+ isPending: false,
+ isError: false,
+ data: { projectAccess: "all", projectIds: [] as string[] },
+}));
+vi.mock("@/hooks/queries/workspace-users/use-get-my-project-access", () => ({
+ default: () => myAccess(),
+}));
vi.mock("@/lib/toast", () => ({ toast: { success: vi.fn(), error: vi.fn() } }));
vi.mock("./invitation-link-field", () => ({ default: () => null }));
function wrapper({ children }: PropsWithChildren) {
@@ -146,6 +154,52 @@ describe("invitation project access", () => {
);
});
+ it("starts a limited inviter on selected projects", async () => {
+ myAccess.mockReturnValue({
+ isPending: false,
+ isError: false,
+ data: { projectAccess: "selected", projectIds: ["project-a"] },
+ });
+ render(<InviteTeamMemberModal open onClose={vi.fn()} />, { wrapper });
+ await fillEmail();
+
+ expect(
+ screen.getByRole("radio", { name: /team:projectAccess.allProjects/ }),
+ ).toHaveAttribute("aria-disabled", "true");
+ expect(
+ screen.getByRole("radio", {
+ name: /team:projectAccess.selectedProjects/,
+ }),
+ ).toHaveAttribute("aria-checked", "true");
+ myAccess.mockReturnValue({
+ isPending: false,
+ isError: false,
+ data: { projectAccess: "all", projectIds: [] },
+ });
+ });
+
+ it("waits for the inviter's own access before sending", async () => {
+ myAccess.mockReturnValue({
+ isPending: true,
+ isError: false,
+ data: undefined as unknown as {
+ projectAccess: string;
+ projectIds: string[];
+ },
+ });
+ render(<InviteTeamMemberModal open onClose={vi.fn()} />, { wrapper });
+ await fillEmail();
+
+ expect(
+ screen.getByRole("button", { name: "team:inviteModal.sendInvitation" }),
+ ).toBeDisabled();
+ myAccess.mockReturnValue({
+ isPending: false,
+ isError: false,
+ data: { projectAccess: "all", projectIds: [] },
+ });
+ });
+
it("requires a project before inviting with selected access", async () => {
render(<InviteTeamMemberModal open onClose={vi.fn()} />, { wrapper });
await fillEmail();
diff --git a/apps/web/src/components/team/invite-team-member-modal.tsx b/apps/web/src/components/team/invite-team-member-modal.tsx
index 52b65c202..2c195731e 100644
--- a/apps/web/src/components/team/invite-team-member-modal.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.tsx
@@ -62,8 +62,10 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
id: string;
email: string;
} | null>(null);
- const { data: myAccess } = useGetMyProjectAccess(workspaceId ?? "", open);
- const inviterLimited = myAccess?.projectAccess === "selected";
+ const myAccess = useGetMyProjectAccess(workspaceId ?? "", open);
+ const isMyAccessPending = myAccess.isPending;
+ const inviterLimited =
+ myAccess.isError || myAccess.data?.projectAccess === "selected";
const [chosenAccess, setProjectAccess] = useState<ProjectAccessValue | null>(
null,
);
@@ -215,7 +217,7 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
}}
projects={projects}
isLoadingProjects={isLoadingProjects}
- disabled={form.formState.isSubmitting}
+ disabled={form.formState.isSubmitting || isMyAccessPending}
error={
showProjectAccessError
? t("team:projectAccess.selectAtLeastOne")
@@ -233,7 +235,7 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
<Button
type="submit"
size="sm"
- disabled={!workspaceId || !canInvite}
+ disabled={!workspaceId || !canInvite || isMyAccessPending}
>
{t("team:inviteModal.sendInvitation")}
</Button>
diff --git a/apps/web/src/components/team/member-project-access-dialog.tsx b/apps/web/src/components/team/member-project-access-dialog.tsx
index d5791bd64..81892ca45 100644
--- a/apps/web/src/components/team/member-project-access-dialog.tsx
+++ b/apps/web/src/components/team/member-project-access-dialog.tsx
@@ -43,7 +43,9 @@ function MemberProjectAccessDialog({
workspaceId,
includeArchived: true,
});
- const { data: myAccess } = useGetMyProjectAccess(workspaceId, open);
+ const myAccess = useGetMyProjectAccess(workspaceId, open);
+ const managerLimited =
+ myAccess.isError || myAccess.data?.projectAccess === "selected";
const { mutateAsync, isPending } = useUpdateMemberProjectAccess();
if (open !== wasOpen) {
@@ -90,7 +92,7 @@ function MemberProjectAccessDialog({
</DialogHeader>
<DialogPanel>
<ProjectAccessFields
- allowAll={myAccess?.projectAccess !== "selected"}
+ allowAll={!managerLimited}
value={value}
onChange={(next) => {
setValue(next);
@@ -98,7 +100,7 @@ function MemberProjectAccessDialog({
}}
projects={projects}
isLoadingProjects={isLoadingProjects}
- disabled={isPending}
+ disabled={isPending || myAccess.isPending}
error={
showError ? t("team:projectAccess.selectAtLeastOne") : undefined
}
@@ -113,7 +115,7 @@ function MemberProjectAccessDialog({
<Button
size="sm"
type="button"
- disabled={isPending || isLoadingProjects}
+ disabled={isPending || isLoadingProjects || myAccess.isPending}
onClick={handleSave}
>
{t("team:projectAccess.save")}
diff --git a/apps/web/src/hooks/use-user-websocket.ts b/apps/web/src/hooks/use-user-websocket.ts
index b55cb7877..322df3f95 100644
--- a/apps/web/src/hooks/use-user-websocket.ts
+++ b/apps/web/src/hooks/use-user-websocket.ts
@@ -151,6 +151,7 @@ export function useUserWebSocket() {
["search", { workspaceId }],
["workspace-activity", workspaceId],
["labels", workspaceId],
+ ["workspace-users", workspaceId, "project-access"],
["notifications"],
])
void queryClient.invalidateQueries({ queryKey });