diff --git a/src/renderer/components/Experiment/Eval/EvalJobsTable.tsx b/src/renderer/components/Experiment/Eval/EvalJobsTable.tsx index ac6c602f550ceadf2ae954fd0ec4c885a6fa3147..846e36075a14b59c69751193f9e7a4672c571e83 100644 --- a/src/renderer/components/Experiment/Eval/EvalJobsTable.tsx +++ b/src/renderer/components/Experiment/Eval/EvalJobsTable.tsx @@ -16,6 +16,7 @@ import ViewOutputModalStreaming from './ViewOutputModalStreaming'; import dayjs from 'dayjs'; import relativeTime from 'dayjs/plugin/relativeTime'; import { jobChipColor } from 'renderer/lib/utils'; +import JobProgress from '../Train/JobProgress'; dayjs.extend(relativeTime); var duration = require('dayjs/plugin/duration'); dayjs.extend(duration); @@ -66,16 +67,7 @@ const EvalJobsTable = () => { {job?.job_data?.evaluator} </td> <td> - <Chip - sx={{ - backgroundColor: jobChipColor(job.status), - color: 'var(--joy-palette-neutral-800)', - }} - > - {job.status} - </Chip> - <br /> - Progress: {job?.progress} + <JobProgress job={job} /> </td> <td> Started: diff --git a/src/renderer/components/Experiment/Train/JobProgress.tsx b/src/renderer/components/Experiment/Train/JobProgress.tsx index c65e6e65bd641382587fc55723f032f50860b179..d38590bcaeea7930bad7c61474deea251bf3ffe1 100644 --- a/src/renderer/components/Experiment/Train/JobProgress.tsx +++ b/src/renderer/components/Experiment/Train/JobProgress.tsx @@ -58,9 +58,10 @@ export default function JobProgress({ job }) { : ' - ' + Number.parseFloat(job.progress).toFixed(1) + '%'} </Chip> {job?.job_data?.start_time && ( - <>Started: {dayjs(job?.job_data?.start_time).fromNow()}</> + <> + Started: {dayjs(job?.job_data?.start_time).fromNow()} <br /> + </> )} - <br /> {job?.job_data?.end_time && job?.job_data?.end_time && ( <> Completed in:{' '} @@ -70,10 +71,10 @@ export default function JobProgress({ job }) { dayjs(job?.job_data?.start_time) ) ) - .humanize()} + .humanize()}{' '} + <br /> </> )} - <br /> {job?.status == 'COMPLETE' && (job?.job_data?.completion_status ? ( <>