Merge pull request #586 from sahitya-chandra/LT-table-fields-swap

Response and Commit to open fields position swaped in LT table

Author: jayantbh

web-server/src/components/PRTable/PullRequestsTableHead.tsx

@@ -67,7 +67,7 @@ export const PullRequestsTableHead: FC<PullRequestsTableHeadProps> = ({
               <Checkbox
                 checked={allPrsSelected}
                 indeterminate={somePrsSelected}
-                onChange={(e) => {
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                   const isChecked = e.target.checked;
                   if (isChecked && noPrsSelected) {
                     selectedPrIds.set(prs.map((pr) => pr.id));
@@ -95,35 +95,41 @@ export const PullRequestsTableHead: FC<PullRequestsTableHeadProps> = ({
           </TableSortLabel>
         </TableCell>
 
-        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
-          <TableSortLabel
-            direction={conf.field === 'commits' ? conf.order : 'asc'}
-            active={conf.field === 'commits'}
-            onClick={() => updateSortConf('commits')}
-          >
-            Commits
-          </TableSortLabel>
-        </TableCell>
+        {enabledColumnsSet.has('commits') && (
+          <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
+            <TableSortLabel
+              direction={conf.field === 'commits' ? conf.order : 'asc'}
+              active={conf.field === 'commits'}
+              onClick={() => updateSortConf('commits')}
+            >
+              Commits
+            </TableSortLabel>
+          </TableCell>
+        )}
 
-        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
-          <TableSortLabel
-            direction={conf.field === 'additions' ? conf.order : 'asc'}
-            active={conf.field === 'additions'}
-            onClick={() => updateSortConf('additions')}
-          >
-            Lines
-          </TableSortLabel>
-        </TableCell>
+        {enabledColumnsSet.has('lines_changed') && (
+          <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
+            <TableSortLabel
+              direction={conf.field === 'additions' ? conf.order : 'asc'}
+              active={conf.field === 'additions'}
+              onClick={() => updateSortConf('additions')}
+            >
+              Lines
+            </TableSortLabel>
+          </TableCell>
+        )}
 
-        <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
-          <TableSortLabel
-            direction={conf.field === 'comments' ? conf.order : 'asc'}
-            active={conf.field === 'comments'}
-            onClick={() => updateSortConf('comments')}
-          >
-            Comments
-          </TableSortLabel>
-        </TableCell>
+        {enabledColumnsSet.has('comments') && (
+          <TableCell sx={{ minWidth: '40%', p: CELL_PAD, py: 1.5 }}>
+            <TableSortLabel
+              direction={conf.field === 'comments' ? conf.order : 'asc'}
+              active={conf.field === 'comments'}
+              onClick={() => updateSortConf('comments')}
+            >
+              Comments
+            </TableSortLabel>
+          </TableCell>
+        )}
 
         {enabledColumnsSet.has('base_branch') && (
           <TableCell
@@ -197,29 +203,29 @@ export const PullRequestsTableHead: FC<PullRequestsTableHeadProps> = ({
             </TableSortLabel>
           </TableCell>
         )}
-        {enabledColumnsSet.has('first_response_time') && (
+        {enabledColumnsSet.has('first_commit_to_open') && (
           <TableCell align="center" sx={{ p: CELL_PAD, py: 1.5 }}>
             <TableSortLabel
               direction={
-                conf.field === 'first_response_time' ? conf.order : 'asc'
+                conf.field === 'first_commit_to_open' ? conf.order : 'asc'
               }
-              active={conf.field === 'first_response_time'}
-              onClick={() => updateSortConf('first_response_time')}
+              active={conf.field === 'first_commit_to_open'}
+              onClick={() => updateSortConf('first_commit_to_open')}
             >
-              Response <ClockIcon />
+              Commit to Open <ClockIcon />
             </TableSortLabel>
           </TableCell>
         )}
-        {enabledColumnsSet.has('first_commit_to_open') && (
+        {enabledColumnsSet.has('first_response_time') && (
           <TableCell align="center" sx={{ p: CELL_PAD, py: 1.5 }}>
             <TableSortLabel
               direction={
-                conf.field === 'first_commit_to_open' ? conf.order : 'asc'
+                conf.field === 'first_response_time' ? conf.order : 'asc'
               }
-              active={conf.field === 'first_commit_to_open'}
-              onClick={() => updateSortConf('first_commit_to_open')}
+              active={conf.field === 'first_response_time'}
+              onClick={() => updateSortConf('first_response_time')}
             >
-              Commit to Open <ClockIcon />
+              Response <ClockIcon />
             </TableSortLabel>
           </TableCell>
         )}