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): reset the invite dialog after it closes

Andrej10014952f318
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 283ebd031..7c2c81a8e 100644
--- a/apps/web/src/components/team/invite-team-member-modal.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.tsx
@@ -64,7 +64,7 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
useState<ProjectAccessValue>(ALL_PROJECTS_ACCESS);
const [showProjectAccessError, setShowProjectAccessError] = useState(false);
const { data: projects, isLoading: isLoadingProjects } = useGetProjects({
- workspaceId: open ? (workspaceId ?? "") : "",
+ workspaceId: workspaceId ?? "",
});
const form = useForm<TeamMemberFormValues>({
@@ -117,8 +117,7 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
return;
}
- resetInviteTeamMember();
- onClose();
+ closeModal();
} catch (error) {
toast.error(
error instanceof Error ? error.message : t("team:inviteModal.error"),
@@ -126,25 +125,31 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
}
};
- const resetInviteTeamMember = async () => {
+ const closeModal = () => {
if (workspaceId) {
- await queryClient.invalidateQueries({
+ void queryClient.invalidateQueries({
queryKey: ["workspace-users", workspaceId],
});
}
- form.reset();
- setProjectAccess(ALL_PROJECTS_ACCESS);
- setShowProjectAccessError(false);
+ onClose();
};
- const resetAndCloseModal = () => {
+ const resetAfterClose = (isOpen: boolean) => {
+ if (isOpen) return;
setCreatedInvitation(null);
- resetInviteTeamMember();
- onClose();
+ form.reset();
+ setProjectAccess(ALL_PROJECTS_ACCESS);
+ setShowProjectAccessError(false);
};
return (
- <Dialog open={open} onOpenChange={resetAndCloseModal}>
+ <Dialog
+ open={open}
+ onOpenChange={(isOpen) => {
+ if (!isOpen) closeModal();
+ }}
+ onOpenChangeComplete={resetAfterClose}
+ >
<DialogPopup className="w-full max-w-md">
<DialogHeader>
<DialogTitle>
@@ -165,7 +170,7 @@ function InviteTeamMemberModal({ open, onClose }: Props) {
<InvitationLinkField invitationId={createdInvitation.id} />
</DialogPanel>
<DialogFooter>
- <Button size="sm" onClick={resetAndCloseModal}>
+ <Button size="sm" onClick={closeModal}>
{t("team:inviteModal.done")}
</Button>
</DialogFooter>
diff --git a/apps/web/src/components/team/project-access/toggle-project-id.test.ts b/apps/web/src/components/team/project-access/toggle-project-id.test.ts
deleted file mode 100644
index 94c9329e7..000000000
--- a/apps/web/src/components/team/project-access/toggle-project-id.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { describe, expect, it } from "vite-plus/test";
-import { toggleProjectId } from "./toggle-project-id";
-
-describe("toggleProjectId", () => {
- it("adds a checked project once and removes an unchecked one", () => {
- expect(toggleProjectId(["a"], "b", true)).toEqual(["a", "b"]);
- expect(toggleProjectId(["a", "b"], "b", true)).toEqual(["a", "b"]);
- expect(toggleProjectId(["a", "b"], "a", false)).toEqual(["b"]);
- });
-});
diff --git a/apps/web/src/components/team/project-access/toggle-project-id.ts b/apps/web/src/components/team/project-access/toggle-project-id.ts
deleted file mode 100644
index 826c18705..000000000
--- a/apps/web/src/components/team/project-access/toggle-project-id.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export function toggleProjectId(
- projectIds: string[],
- projectId: string,
- checked: boolean,
-): string[] {
- const rest = projectIds.filter((id) => id !== projectId);
- return checked ? [...rest, projectId] : rest;
-}