Skip to content

Commit c9a4f06

Browse files
Merge pull request #5 from eth-cscs/iram-1415-sort-jobs-by-date
IRAM 1415
2 parents e4c1842 + 9fcd641 commit c9a4f06

File tree

3 files changed

+546
-178
lines changed

3 files changed

+546
-178
lines changed

app/modules/compute/components/lists/JobList.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const JobTableRow: React.FC<JobTableRowProps> = ({ systemJob }: JobTableRowProps
8686
</div>
8787
<div className='flex items-center text-xs text-gray-500 mb-1'>
8888
<CalendarIcon aria-hidden='true' className='mr-1 h-4 w-4 flex-shrink-0 text-gray-500' />
89-
{formatDateTimeFromTimestamp({ timestamp: job.time.submission })}
89+
{formatDateTimeFromTimestamp({ timestamp: job.time.start })}
9090
</div>
9191
<div className='flex items-center text-xs text-gray-500'>
9292
<ClockIcon aria-hidden='true' className='mr-1 h-4 w-4 flex-shrink-0 text-gray-500' />
@@ -108,10 +108,10 @@ const JobTableRow: React.FC<JobTableRowProps> = ({ systemJob }: JobTableRowProps
108108
<td className='py-3 align-top tabular-nums text-gray-700'>
109109
{(job.status.state === JobStateStatus.RUNNING ||
110110
job.status.state === JobStateStatus.COMPLETED) && (
111-
<>
112-
<div className='truncate text-gray-500 text-xs mb-1'>Partition: {job.partition}</div>
113-
</>
114-
)}
111+
<>
112+
<div className='truncate text-gray-500 text-xs mb-1'>Partition: {job.partition}</div>
113+
</>
114+
)}
115115
{job.status.state === 'PENDING' && (
116116
<>
117117
<div className='truncate text-gray-500 text-xs mb-1'>
@@ -241,7 +241,7 @@ const SystemJobList: React.FC<any> = ({ systemsJobs }) => {
241241
job: job,
242242
}))
243243
})
244-
.sort((a: any, b: any) => b.job.time.submission - a.job.time.submission)
244+
.sort((a: any, b: any) => b.job.time.start - a.job.time.start)
245245
return (
246246
<>
247247
<UnavailableSystemAlert unavailableSystemsJobs={unavailableSystemsJobs} className='mb-6' />

app/types/api-job.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export interface JobExitCode {
1919
export interface JobTime {
2020
elapsed: number
2121
start: number
22-
submission: number
2322
end: number
2423
suspended: number
2524
limit: number

0 commit comments

Comments
 (0)