github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-12 16:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Queue status/timeleft improvements

Browse source 
Closes #1424
This commit is contained in:
Qstick 2022-06-04 15:07:21 -05:00
parent a41e8deb03
commit f549a36c6f
4 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Activity/Queue/QueueStatusCell.css
View file

@ -3,3 +3,7 @@
width: 30px; width: 30px;
} }
.noMessages {
margin-bottom: 10px;
}

20
frontend/src/Activity/Queue/QueueStatusCell.js
View file

@ -13,7 +13,10 @@ function getDetailedPopoverBody(statusMessages) {
{ {
statusMessages.map(({ title, messages }) => { statusMessages.map(({ title, messages }) => {
return ( return (
<div key={title}> <div
key={title}
className={messages.length ? undefined: styles.noMessages}
>
{title} {title}
<ul> <ul>
{ {
@ -52,10 +55,6 @@ function QueueStatusCell(props) {
let iconKind = kinds.DEFAULT; let iconKind = kinds.DEFAULT;
let title = translate('Downloading'); let title = translate('Downloading');
if (hasWarning) {
iconKind = kinds.WARNING;
}
if (status === 'paused') { if (status === 'paused') {
iconName = icons.PAUSED; iconName = icons.PAUSED;
title = 'Paused'; title = 'Paused';
@ -72,17 +71,24 @@ function QueueStatusCell(props) {
if (trackedDownloadState === 'importPending') { if (trackedDownloadState === 'importPending') {
title += ' - Waiting to Import'; title += ' - Waiting to Import';
iconKind = kinds.PURPLE;
} }
if (trackedDownloadState === 'importing') { if (trackedDownloadState === 'importing') {
title += ' - Importing'; title += ' - Importing';
iconKind = kinds.PURPLE;
} }
if (trackedDownloadState === 'failedPending') { if (trackedDownloadState === 'failedPending') {
title += ' - Waiting to Process'; title += ' - Waiting to Process';
iconKind = kinds.DANGER;
} }
} }
if (hasWarning) {
iconKind = kinds.WARNING;
}
if (status === 'delay') { if (status === 'delay') {
iconName = icons.PENDING; iconName = icons.PENDING;
title = 'Pending'; title = 'Pending';
@ -146,8 +152,8 @@ QueueStatusCell.propTypes = {
}; };
QueueStatusCell.defaultProps = { QueueStatusCell.defaultProps = {
trackedDownloadStatus: 'ok', trackedDownloadStatus: 'Ok',
trackedDownloadState: 'downloading' trackedDownloadState: 'Downloading'
}; };
export default QueueStatusCell; export default QueueStatusCell;

6
frontend/src/Activity/Queue/TimeleftCell.js
View file

@ -20,7 +20,7 @@ function TimeleftCell(props) {
timeFormat timeFormat
} = props; } = props;
if (status === 'Delay') { if (status === 'delay') {
const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates); const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true }); const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
@ -34,7 +34,7 @@ function TimeleftCell(props) {
); );
} }
if (status === 'DownloadClientUnavailable') { if (status === 'downloadClientUnavailable') {
const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates); const date = getRelativeDate(estimatedCompletionTime, shortDateFormat, showRelativeDates);
const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true }); const time = formatTime(estimatedCompletionTime, timeFormat, { includeMinuteZero: true });
@ -48,7 +48,7 @@ function TimeleftCell(props) {
); );
} }
if (!timeleft) { if (!timeleft || status === 'completed' || status === 'failed') {
return ( return (
<TableRowCell className={styles.timeleft}> <TableRowCell className={styles.timeleft}>
- -

4
frontend/src/Components/Icon.css
View file

@ -25,3 +25,7 @@
.warning { .warning {
color: $warningColor; color: $warningColor;
} }
.purple {
color: $purple;
}