Add missing sorting functionality

fiaisis · Feb 29, 2024 · 5a067f1 · 5a067f1
1 parent 7754b2e
commit 5a067f1
Showing 1 changed file with 30 additions and 22 deletions.
diff --git a/src/ReductionHistory.tsx b/src/ReductionHistory.tsx
@@ -179,7 +179,15 @@ const ReductionHistory: React.FC = () => {
                   Experiment Number
                 </TableSortLabel>
               </TableCell>
-              <TableCell>Reduction Input</TableCell>
+              <TableCell>
+                <TableSortLabel
+                  active={orderBy === 'filename'}
+                  direction={orderBy === 'filename' ? orderDirection : 'asc'}
+                  onClick={() => handleSort('filename')}
+                >
+                  Reduction Input
+                </TableSortLabel>
+              </TableCell>
               <TableCell>
                 <TableSortLabel
                   active={orderBy === 'reduction_state'}
@@ -191,50 +199,50 @@ const ReductionHistory: React.FC = () => {
               </TableCell>
               <TableCell>
                 <TableSortLabel
-                  active={orderBy === 'reduction_start'}
-                  direction={orderBy === 'reduction_start' ? orderDirection : 'asc'}
-                  onClick={() => handleSort('reduction_start')}
+                  active={orderBy === 'run_start'}
+                  direction={orderBy === 'run_start' ? orderDirection : 'asc'}
+                  onClick={() => handleSort('run_start')}
                 >
-                  Reduction Start
+                  Run Start
                 </TableSortLabel>
               </TableCell>
               <TableCell>
                 <TableSortLabel
-                  active={orderBy === 'reduction_start'}
-                  direction={orderBy === 'reduction_start' ? orderDirection : 'asc'}
-                  onClick={() => handleSort('reduction_start')}
+                  active={orderBy === 'run_end'}
+                  direction={orderBy === 'run_end' ? orderDirection : 'asc'}
+                  onClick={() => handleSort('run_end')}
                 >
-                  Reduction End
+                  Run End
                 </TableSortLabel>
               </TableCell>
+              <TableCell>Title</TableCell>
               <TableCell>
                 <TableSortLabel
                   active={orderBy === 'reduction_start'}
                   direction={orderBy === 'reduction_start' ? orderDirection : 'asc'}
                   onClick={() => handleSort('reduction_start')}
                 >
-                  Title
+                  Reduction Start
                 </TableSortLabel>
               </TableCell>
               <TableCell>
                 <TableSortLabel
-                  active={orderBy === 'run_start'}
-                  direction={orderBy === 'run_start' ? orderDirection : 'asc'}
-                  onClick={() => handleSort('run_start')}
+                  active={orderBy === 'reduction_end'}
+                  direction={orderBy === 'reduction_end' ? orderDirection : 'asc'}
+                  onClick={() => handleSort('reduction_end')}
                 >
-                  Run Start
+                  Reduction End
                 </TableSortLabel>
               </TableCell>
               <TableCell>
                 <TableSortLabel
-                  active={orderBy === 'run_end'}
-                  direction={orderBy === 'run_end' ? orderDirection : 'asc'}
-                  onClick={() => handleSort('run_end')}
+                  active={orderBy === 'reduction_outputs'}
+                  direction={orderBy === 'reduction_outputs' ? orderDirection : 'asc'}
+                  onClick={() => handleSort('reduction_outputs')}
                 >
-                  Run End
+                  Reduction Outputs
                 </TableSortLabel>
               </TableCell>
-              <TableCell>Reduction Outputs</TableCell>
             </TableRow>
           </TableHead>
           <TableBody>
@@ -243,11 +251,11 @@ const ReductionHistory: React.FC = () => {
                 <TableCell>{reduction.runs[0].experiment_number}</TableCell>
                 <TableCell>{extractFileName(reduction.runs[0].filename)}</TableCell>
                 <TableCell>{formatReductionStatus(reduction.reduction_state)}</TableCell>
-                <TableCell>{formatDateTime(reduction.reduction_start)}</TableCell>
-                <TableCell>{formatDateTime(reduction.reduction_end)}</TableCell>
-                <TableCell>{reduction.runs[0].title}</TableCell>
                 <TableCell>{formatDateTime(reduction.runs[0].run_start)}</TableCell>
                 <TableCell>{formatDateTime(reduction.runs[0].run_end)}</TableCell>
+                <TableCell>{reduction.runs[0].title}</TableCell>
+                <TableCell>{formatDateTime(reduction.reduction_start)}</TableCell>
+                <TableCell>{formatDateTime(reduction.reduction_end)}</TableCell>
                 <TableCell>{reduction.reduction_outputs}</TableCell>
               </StyledTableRow>
             ))}