open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Showing Grab ID in history details modal

Browse Source 
(cherry picked from commit 6394b3253a5ed41eb2442d3150964dc2b7a537e7)

Closes #4088
pull/4172/head
Bogdan 10 months ago
parent 2bfc6ae5d6
commit 20e1a6e41c
5 changed files with 90 additions and 37 deletions
Show Stats Download Patch File Download Diff File

115
frontend/src/Activity/History/Details/HistoryDetails.js
Unescape View File

@ -60,6 +60,7 @@ function HistoryDetails(props) {
eventType, eventType,
sourceTitle, sourceTitle,
data, data,
downloadId,
shortDateFormat, shortDateFormat,
timeFormat timeFormat
} = props; } = props;
@ -72,7 +73,6 @@ function HistoryDetails(props) {
nzbInfoUrl, nzbInfoUrl,
downloadClient, downloadClient,
downloadClientName, downloadClientName,
downloadId,
age, age,
ageHours, ageHours,
ageMinutes, ageMinutes,
@ -90,20 +90,22 @@ function HistoryDetails(props) {
/> />
{ {
!!indexer && indexer ?
<DescriptionListItem <DescriptionListItem
title={translate('Indexer')} title={translate('Indexer')}
data={indexer} data={indexer}
/> /> :
null
} }
{ {
!!releaseGroup && releaseGroup ?
<DescriptionListItem <DescriptionListItem
descriptionClassName={styles.description} descriptionClassName={styles.description}
title={translate('ReleaseGroup')} title={translate('ReleaseGroup')}
data={releaseGroup} data={releaseGroup}
/> /> :
null
} }
{ {
@ -119,7 +121,7 @@ function HistoryDetails(props) {
nzbInfoUrl ? nzbInfoUrl ?
<span> <span>
<DescriptionListItemTitle> <DescriptionListItemTitle>
Info URL {translate('InfoUrl')}
</DescriptionListItemTitle> </DescriptionListItemTitle>
<DescriptionListItemDescription> <DescriptionListItemDescription>
@ -139,27 +141,30 @@ function HistoryDetails(props) {
} }
{ {
!!downloadId && downloadId ?
<DescriptionListItem <DescriptionListItem
title={translate('GrabID')} title={translate('GrabId')}
data={downloadId} data={downloadId}
/> /> :
null
} }
{ {
!!indexer && age || ageHours || ageMinutes ?
<DescriptionListItem <DescriptionListItem
title={translate('AgeWhenGrabbed')} title={translate('AgeWhenGrabbed')}
data={formatAge(age, ageHours, ageMinutes)} data={formatAge(age, ageHours, ageMinutes)}
/> /> :
null
} }
{ {
!!publishedDate && publishedDate ?
<DescriptionListItem <DescriptionListItem
title={translate('PublishedDate')} title={translate('PublishedDate')}
data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })} data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
/> /> :
null
} }
</DescriptionList> </DescriptionList>
); );
@ -179,11 +184,21 @@ function HistoryDetails(props) {
/> />
{ {
!!message && downloadId ?
<DescriptionListItem
title={translate('GrabId')}
data={downloadId}
/> :
null
}
{
message ?
<DescriptionListItem <DescriptionListItem
title={translate('Message')} title={translate('Message')}
data={message} data={message}
/> /> :
null
} }
</DescriptionList> </DescriptionList>
); );
@ -205,12 +220,13 @@ function HistoryDetails(props) {
/> />
{ {
!!droppedPath && droppedPath ?
<DescriptionListItem <DescriptionListItem
descriptionClassName={styles.description} descriptionClassName={styles.description}
title={translate('Source')} title={translate('Source')}
data={droppedPath} data={droppedPath}
/> /> :
null
} }
{ {
@ -360,9 +376,9 @@ function HistoryDetails(props) {
const { const {
indexer, indexer,
releaseGroup, releaseGroup,
customFormatScore,
nzbInfoUrl, nzbInfoUrl,
downloadClient, downloadClient,
downloadId,
age, age,
ageHours, ageHours,
ageMinutes, ageMinutes,
@ -377,64 +393,80 @@ function HistoryDetails(props) {
/> />
{ {
!!indexer && indexer ?
<DescriptionListItem <DescriptionListItem
title={translate('Indexer')} title={translate('Indexer')}
data={indexer} data={indexer}
/> /> :
null
} }
{ {
!!releaseGroup && releaseGroup ?
<DescriptionListItem <DescriptionListItem
title={translate('ReleaseGroup')} title={translate('ReleaseGroup')}
data={releaseGroup} data={releaseGroup}
/> /> :
null
}
{
customFormatScore && customFormatScore !== '0' ?
<DescriptionListItem
title={translate('CustomFormatScore')}
data={formatCustomFormatScore(customFormatScore)}
/> :
null
} }
{ {
!!nzbInfoUrl && nzbInfoUrl ?
<span> <span>
<DescriptionListItemTitle> <DescriptionListItemTitle>
Info URL {translate('InfoUrl')}
</DescriptionListItemTitle> </DescriptionListItemTitle>
<DescriptionListItemDescription> <DescriptionListItemDescription>
<Link to={nzbInfoUrl}>{nzbInfoUrl}</Link> <Link to={nzbInfoUrl}>{nzbInfoUrl}</Link>
</DescriptionListItemDescription> </DescriptionListItemDescription>
</span> </span> :
null
} }
{ {
!!downloadClient && downloadClient ?
<DescriptionListItem <DescriptionListItem
title={translate('DownloadClient')} title={translate('DownloadClient')}
data={downloadClient} data={downloadClient}
/> /> :
null
} }
{ {
!!downloadId && downloadId ?
<DescriptionListItem <DescriptionListItem
title={translate('GrabID')} title={translate('GrabId')}
data={downloadId} data={downloadId}
/> /> :
null
} }
{ {
!!indexer && age || ageHours || ageMinutes ?
<DescriptionListItem <DescriptionListItem
title={translate('AgeWhenGrabbed')} title={translate('AgeWhenGrabbed')}
data={formatAge(age, ageHours, ageMinutes)} data={formatAge(age, ageHours, ageMinutes)}
/> /> :
null
} }
{ {
!!publishedDate && publishedDate ?
<DescriptionListItem <DescriptionListItem
title={translate('PublishedDate')} title={translate('PublishedDate')}
data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })} data={formatDateTime(publishedDate, shortDateFormat, timeFormat, { includeSeconds: true })}
/> /> :
null
} }
</DescriptionList> </DescriptionList>
); );
@ -454,11 +486,21 @@ function HistoryDetails(props) {
/> />
{ {
!!message && downloadId ?
<DescriptionListItem
title={translate('GrabId')}
data={downloadId}
/> :
null
}
{
message ?
<DescriptionListItem <DescriptionListItem
title={translate('Message')} title={translate('Message')}
data={message} data={message}
/> /> :
null
} }
</DescriptionList> </DescriptionList>
); );
@ -479,6 +521,7 @@ HistoryDetails.propTypes = {
eventType: PropTypes.string.isRequired, eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired, sourceTitle: PropTypes.string.isRequired,
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
downloadId: PropTypes.string,
shortDateFormat: PropTypes.string.isRequired, shortDateFormat: PropTypes.string.isRequired,
timeFormat: PropTypes.string.isRequired timeFormat: PropTypes.string.isRequired
}; };

3
frontend/src/Activity/History/Details/HistoryDetailsModal.js
Unescape View File

@ -42,6 +42,7 @@ function HistoryDetailsModal(props) {
eventType, eventType,
sourceTitle, sourceTitle,
data, data,
downloadId,
isMarkingAsFailed, isMarkingAsFailed,
shortDateFormat, shortDateFormat,
timeFormat, timeFormat,
@ -64,6 +65,7 @@ function HistoryDetailsModal(props) {
eventType={eventType} eventType={eventType}
sourceTitle={sourceTitle} sourceTitle={sourceTitle}
data={data} data={data}
downloadId={downloadId}
shortDateFormat={shortDateFormat} shortDateFormat={shortDateFormat}
timeFormat={timeFormat} timeFormat={timeFormat}
/> />
@ -98,6 +100,7 @@ HistoryDetailsModal.propTypes = {
eventType: PropTypes.string.isRequired, eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired, sourceTitle: PropTypes.string.isRequired,
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
downloadId: PropTypes.string,
isMarkingAsFailed: PropTypes.bool.isRequired, isMarkingAsFailed: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired, shortDateFormat: PropTypes.string.isRequired,
timeFormat: PropTypes.string.isRequired, timeFormat: PropTypes.string.isRequired,

3
frontend/src/Activity/History/HistoryRow.js
Unescape View File

@ -65,6 +65,7 @@ class HistoryRow extends Component {
sourceTitle, sourceTitle,
date, date,
data, data,
downloadId,
isMarkingAsFailed, isMarkingAsFailed,
columns, columns,
shortDateFormat, shortDateFormat,
@ -244,6 +245,7 @@ class HistoryRow extends Component {
eventType={eventType} eventType={eventType}
sourceTitle={sourceTitle} sourceTitle={sourceTitle}
data={data} data={data}
downloadId={downloadId}
isMarkingAsFailed={isMarkingAsFailed} isMarkingAsFailed={isMarkingAsFailed}
shortDateFormat={shortDateFormat} shortDateFormat={shortDateFormat}
timeFormat={timeFormat} timeFormat={timeFormat}
@ -269,6 +271,7 @@ HistoryRow.propTypes = {
sourceTitle: PropTypes.string.isRequired, sourceTitle: PropTypes.string.isRequired,
date: PropTypes.string.isRequired, date: PropTypes.string.isRequired,
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
downloadId: PropTypes.string,
isMarkingAsFailed: PropTypes.bool, isMarkingAsFailed: PropTypes.bool,
markAsFailedError: PropTypes.object, markAsFailedError: PropTypes.object,
columns: PropTypes.arrayOf(PropTypes.object).isRequired, columns: PropTypes.arrayOf(PropTypes.object).isRequired,

3
frontend/src/Artist/History/ArtistHistoryRow.js
Unescape View File

@ -82,6 +82,7 @@ class ArtistHistoryRow extends Component {
customFormatScore, customFormatScore,
date, date,
data, data,
downloadId,
album album
} = this.props; } = this.props;
@ -128,6 +129,7 @@ class ArtistHistoryRow extends Component {
eventType={eventType} eventType={eventType}
sourceTitle={sourceTitle} sourceTitle={sourceTitle}
data={data} data={data}
downloadId={downloadId}
/> />
} }
position={tooltipPositions.LEFT} position={tooltipPositions.LEFT}
@ -180,6 +182,7 @@ ArtistHistoryRow.propTypes = {
customFormatScore: PropTypes.number.isRequired, customFormatScore: PropTypes.number.isRequired,
date: PropTypes.string.isRequired, date: PropTypes.string.isRequired,
data: PropTypes.object.isRequired, data: PropTypes.object.isRequired,
downloadId: PropTypes.string,
fullArtist: PropTypes.bool.isRequired, fullArtist: PropTypes.bool.isRequired,
artist: PropTypes.object.isRequired, artist: PropTypes.object.isRequired,
album: PropTypes.object.isRequired, album: PropTypes.object.isRequired,

3
src/NzbDrone.Core/Localization/Core/en.json
Unescape View File

@ -401,7 +401,7 @@
"GoToArtistListing": "Go to artist listing", "GoToArtistListing": "Go to artist listing",
"GoToInterp": "Go to {0}", "GoToInterp": "Go to {0}",
"Grab": "Grab", "Grab": "Grab",
"GrabID": "Grab ID", "GrabId": "Grab ID",
"GrabRelease": "Grab Release", "GrabRelease": "Grab Release",
"GrabReleaseMessageText": "Lidarr was unable to determine which artist and album this release was for. Lidarr may be unable to automatically import this release. Do you want to grab '{0}'?", "GrabReleaseMessageText": "Lidarr was unable to determine which artist and album this release was for. Lidarr may be unable to automatically import this release. Do you want to grab '{0}'?",
"GrabSelected": "Grab Selected", "GrabSelected": "Grab Selected",
@ -474,6 +474,7 @@
"IndexerTagHelpText": "Only use this indexer for artist with at least one matching tag. Leave blank to use with all artists.", "IndexerTagHelpText": "Only use this indexer for artist with at least one matching tag. Leave blank to use with all artists.",
"Indexers": "Indexers", "Indexers": "Indexers",
"Info": "Info", "Info": "Info",
"InfoUrl": "Info URL",
"InstanceName": "Instance Name", "InstanceName": "Instance Name",
"InstanceNameHelpText": "Instance name in tab and for Syslog app name", "InstanceNameHelpText": "Instance name in tab and for Syslog app name",
"InteractiveImport": "Interactive Import", "InteractiveImport": "Interactive Import",

Write Preview
Loading…
Cancel
Save