Skip to content

Commit 80c2402

Browse files
committed
feat: trigger member modal via push-modal
1 parent 2634dde commit 80c2402

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

src/components/member/member-table.tsx

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import {
2929

3030
import { api } from "@/trpc/react";
3131

32-
import MemberModal from "@/components/member/member-modal";
3332
import { Avatar, AvatarImage } from "@/components/ui/avatar";
3433
import type { RouterOutputs } from "@/trpc/shared";
3534
import { RiMore2Fill } from "@remixicon/react";
3635
import { useSession } from "next-auth/react";
3736
import { useRouter } from "next/navigation";
37+
import { pushModal } from "../modals";
3838
import { DataTable } from "../ui/data-table/data-table";
3939
import { DataTableBody } from "../ui/data-table/data-table-body";
4040
import { SortButton } from "../ui/data-table/data-table-buttons";
@@ -171,7 +171,7 @@ export const columns: ColumnDef<Member[number]>[] = [
171171

172172
const status = member.status;
173173
const memberId = member.id;
174-
const email = member.user?.email;
174+
const email = member?.user?.email;
175175

176176
const isActive = status === "ACTIVE";
177177
const isPending = status === "PENDING";
@@ -226,21 +226,24 @@ export const columns: ColumnDef<Member[number]>[] = [
226226
)}
227227

228228
{status === "ACTIVE" && (
229-
<MemberModal
230-
isEditMode
231-
memberId={member.id}
232-
title="Update team member"
233-
subtitle="Update team member's account information."
234-
member={{
235-
name: member.user?.name ?? "",
236-
email: email ?? "",
237-
title: member.title ?? "",
229+
<DropdownMenuItem
230+
onClick={() => {
231+
pushModal("TeamMemberModal", {
232+
isEditMode: true,
233+
memberId,
234+
title: "Update team member",
235+
subtitle: "Update team member's account information.",
236+
member: {
237+
name: member.user.name ?? "",
238+
loginEmail: "",
239+
title: member.title ?? "",
240+
workEmail: member.workEmail ?? "",
241+
},
242+
});
238243
}}
239244
>
240-
<span className="relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50">
241-
Update member
242-
</span>
243-
</MemberModal>
245+
Update member
246+
</DropdownMenuItem>
244247
)}
245248

246249
<DropdownMenuSeparator />

0 commit comments

Comments
 (0)