From 630447a2f6a3eedcad98a86423cbaf167bdc5f34 Mon Sep 17 00:00:00 2001
From: Sammy Teillet <sammy.teillet@gmail.com>
Date: Wed, 19 Apr 2023 18:21:42 +0200
Subject: [PATCH] refactor: put TD up back in the table

---
 front/src/components/table/ClickableCell.tsx | 11 +++++-----
 front/src/components/table/Table.tsx         | 11 +++++-----
 front/src/pages/people/People.tsx            | 22 ++++++++------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/front/src/components/table/ClickableCell.tsx b/front/src/components/table/ClickableCell.tsx
index 53d9d08e9..515006308 100644
--- a/front/src/components/table/ClickableCell.tsx
+++ b/front/src/components/table/ClickableCell.tsx
@@ -4,14 +4,15 @@ import { Link } from 'react-router-dom';
 
 type OwnProps = {
   href: string;
-  id: string;
   children?: React.ReactNode;
 };
 
-const TD = styled.td`
+const StyledClickable = styled.div`
   position: relative;
   box-sizing: border-box;
   height: 32px;
+  display: flex;
+  align-items: center;
 
   ::before {
     content: '';
@@ -35,13 +36,13 @@ const Container = styled.span`
   padding-left: ${(props) => props.theme.spacing(2)};
 `;
 
-function ClickableCell({ href, children, id }: OwnProps) {
+function ClickableCell({ href, children }: OwnProps) {
   return (
-    <TD key={id}>
+    <StyledClickable>
       <Link to={href}>
         <Container>{children}</Container>
       </Link>
-    </TD>
+    </StyledClickable>
   );
 }
 
diff --git a/front/src/components/table/Table.tsx b/front/src/components/table/Table.tsx
index 8f909edce..6652c2ad0 100644
--- a/front/src/components/table/Table.tsx
+++ b/front/src/components/table/Table.tsx
@@ -32,7 +32,7 @@ const StyledTable = styled.table`
     :last-child {
       border-right-color: transparent;
     }
-    :first-child {
+    :first-of-type {
       border-left-color: transparent;
     }
   }
@@ -46,7 +46,7 @@ const StyledTable = styled.table`
     :last-child {
       border-right-color: transparent;
     }
-    :first-child {
+    :first-of-type {
       border-left-color: transparent;
     }
   }
@@ -89,9 +89,10 @@ function Table({ data, columns, viewName, viewIcon }: OwnProps) {
           {table.getRowModel().rows.map((row) => (
             <tr key={row.id}>
               {row.getVisibleCells().map((cell) => {
-                return flexRender(
-                  cell.column.columnDef.cell,
-                  cell.getContext(),
+                return (
+                  <td key={cell.id}>
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  </td>
                 );
               })}
             </tr>
diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx
index 54d2a13ed..2d1ab5048 100644
--- a/front/src/pages/people/People.tsx
+++ b/front/src/pages/people/People.tsx
@@ -108,24 +108,24 @@ const columns = [
   columnHelper.accessor('fullName', {
     header: () => <ColumnHead viewName="People" viewIcon={faUser} />,
     cell: (props) => (
-      <td key={props.cell.id}>
+      <>
         <HorizontalyAlignedContainer>
           <Checkbox
             id={`person-selected-${props.row.original.email}`}
-            name={`person-selected${props.row.original.email}`}
+            name={`person-selected-${props.row.original.email}`}
           />
           <PersonChip
             name={props.row.original.fullName}
             picture={props.row.original.picture}
           />
         </HorizontalyAlignedContainer>
-      </td>
+      </>
     ),
   }),
   columnHelper.accessor('email', {
     header: () => <ColumnHead viewName="Email" viewIcon={faEnvelope} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
+      <ClickableCell href="#">
         <a href={`mailto:${props.row.original.email}`}>
           {props.row.original.email}
         </a>
@@ -135,7 +135,7 @@ const columns = [
   columnHelper.accessor('company', {
     header: () => <ColumnHead viewName="Company" viewIcon={faBuildings} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
+      <ClickableCell href="#">
         <CompanyChip
           name={props.row.original.company.name}
           picture={`https://www.google.com/s2/favicons?domain=${props.row.original.company.domain}&sz=256`}
@@ -146,7 +146,7 @@ const columns = [
   columnHelper.accessor('phone', {
     header: () => <ColumnHead viewName="Phone" viewIcon={faPhone} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
+      <ClickableCell href="#">
         <a
           href={parsePhoneNumber(
             props.row.original.phone,
@@ -164,7 +164,7 @@ const columns = [
   columnHelper.accessor('creationDate', {
     header: () => <ColumnHead viewName="Creation" viewIcon={faCalendar} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
+      <ClickableCell href="#">
         {new Intl.DateTimeFormat(undefined, {
           month: 'short',
           day: 'numeric',
@@ -176,17 +176,13 @@ const columns = [
   columnHelper.accessor('pipe', {
     header: () => <ColumnHead viewName="Pipe" viewIcon={faRectangleHistory} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
-        {props.row.original.pipe.name}
-      </ClickableCell>
+      <ClickableCell href="#">{props.row.original.pipe.name}</ClickableCell>
     ),
   }),
   columnHelper.accessor('city', {
     header: () => <ColumnHead viewName="City" viewIcon={faMapPin} />,
     cell: (props) => (
-      <ClickableCell id={props.cell.id} href="#">
-        {props.row.original.city}
-      </ClickableCell>
+      <ClickableCell href="#">{props.row.original.city}</ClickableCell>
     ),
   }),
 ];