Skip to content

Commit dac83b9

Browse files
FIREFLY-1770: Improve UI of JobProgress component
1 parent fe2c3fe commit dac83b9

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

src/firefly/js/core/background/JobInfo.jsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,22 @@ export function JobProgress({jobInfo, ...props}) {
121121
if (!isActive(jobInfo)) return null;
122122

123123
const pct = getJobPctComplete(jobInfo);
124-
const lpProps = pct >= 0 ? {determinate:true, value:pct} : {size:'md'};
124+
const lpProps = pct >= 0 ? {determinate:true, value:pct} : {};
125125
return (
126-
<Slot component={Sheet} variant='soft' sx={{flexGrow:1, padding:1}} slotProps={{...props}}>
127-
<Stack direction='row' spacing={1} alignItems='center'>
128-
<Typography level='title-sm' >Progress:</Typography>
129-
<LinearProgress variant='outlined' {...lpProps}/>
126+
<Stack spacing={.25} {...props} sx={{flex: 1, ...props?.sx}}>
127+
<Stack direction='row' spacing={1} alignItems='baseline'>
128+
<Typography level='title-sm'>Progress:</Typography>
129+
<Typography level='body-sm' title={msg}
130+
sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>
131+
{msg}
132+
</Typography>
133+
<Typography level='body-sm' color='primary'
134+
sx={{fontVariantNumeric: 'tabular-nums', flexGrow: 1, textAlign: 'right'}}>
135+
{elapsed}
136+
</Typography>
130137
</Stack>
131-
<Stack direction='row' spacing={1}>
132-
<Typography level='body-xs' color='warning' sx={{fontVariantNumeric: 'tabular-nums'}}> {elapsed}</Typography>
133-
<Typography level='body-xs' fontStyle='italic' title={msg} sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis',}}> {msg} </Typography>
134-
</Stack>
135-
</Slot>
138+
<LinearProgress variant='solid' thickness={2} {...lpProps}/>
139+
</Stack>
136140
);
137141
}
138142

@@ -155,7 +159,7 @@ function JobInfoDetails({jobInfo={}}) {
155159
<JobIdWrapper jobInfo={jobInfo}/>
156160
</GridRow>
157161
<GridRow>
158-
<JobProgress jobInfo={jobInfo}/>
162+
<JobProgress jobInfo={jobInfo} sx={{mb: 1, mr: 1}}/>
159163
</GridRow>
160164
<GridRow>
161165
<KeywordBlock label='Creation Time' title='Referred to as "creationTime" in UWS' value={toDateString(creationTime, useLocalTime)} {...dateProps}/>

0 commit comments

Comments
 (0)