DEAR-125: show marked user in team members table

24FSIIT16 · Jul 21, 2024 · 1745125 · 1745125
1 parent 2471425
commit 1745125
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/(main)/team/(teammember)/[id]/members/page.tsx b/app/(main)/team/(teammember)/[id]/members/page.tsx
@@ -26,7 +26,8 @@ const TeamMembersPage: React.FC<TeamMembersPageProps> = ({ params }) => {
   const inputRef = React.useRef<HTMLInputElement>(null);
   const { data, isLoading, error } = useSWRClient<TeamWithMembers>(`/v1/team-member/${teamId}`);
   const { code: teamCode } = data?.team || {};
-  const { userId: currentUserId } = useAuth();
+  const { userId } = useAuth();
+  const currentUserId = parseInt(userId || '0', 10);
 
   const copyToClipboard = () => {
     const inputValue = inputRef.current?.value;

diff --git a/app/(main)/team/components/TeamMembersTable/columns.tsx b/app/(main)/team/components/TeamMembersTable/columns.tsx
@@ -7,12 +7,10 @@ import cn from '@/lib/utils';
 import DataTableColumnHeader from '@components/ui/Table/DataTableColumnHeader';
 import { Asterisk } from 'lucide-react';
 
-export const columns = (currentUserId: string | undefined): ColumnDef<TeamMemberWithUser>[] => [
+export const columns = (currentUserId: number): ColumnDef<TeamMemberWithUser>[] => [
   {
     id: 'activeUser',
-    cell: ({ row }) => (
-      <div>{currentUserId === row.original.user.id.toString() && <Asterisk className="h-4 w-4" />}</div>
-    ),
+    cell: ({ row }) => <div>{currentUserId === row.original.user.id && <Asterisk className="h-4 w-4" />}</div>,
   },
   {
     id: 'name',