@@ -29,12 +29,12 @@ import {
29
29
30
30
import { api } from "@/trpc/react" ;
31
31
32
- import MemberModal from "@/components/member/member-modal" ;
33
32
import { Avatar , AvatarImage } from "@/components/ui/avatar" ;
34
33
import type { RouterOutputs } from "@/trpc/shared" ;
35
34
import { RiMore2Fill } from "@remixicon/react" ;
36
35
import { useSession } from "next-auth/react" ;
37
36
import { useRouter } from "next/navigation" ;
37
+ import { pushModal } from "../modals" ;
38
38
import { DataTable } from "../ui/data-table/data-table" ;
39
39
import { DataTableBody } from "../ui/data-table/data-table-body" ;
40
40
import { SortButton } from "../ui/data-table/data-table-buttons" ;
@@ -171,7 +171,7 @@ export const columns: ColumnDef<Member[number]>[] = [
171
171
172
172
const status = member . status ;
173
173
const memberId = member . id ;
174
- const email = member . user ?. email ;
174
+ const email = member ? .user ?. email ;
175
175
176
176
const isActive = status === "ACTIVE" ;
177
177
const isPending = status === "PENDING" ;
@@ -226,21 +226,24 @@ export const columns: ColumnDef<Member[number]>[] = [
226
226
) }
227
227
228
228
{ 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
+ } ) ;
238
243
} }
239
244
>
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 >
244
247
) }
245
248
246
249
< DropdownMenuSeparator />
0 commit comments