New: Added column in Queue

(cherry picked from commit 57445bbe57a84990e284ef97d42455a06587e1ee)

Closes #9621

Author: Rubicj

frontend/src/Activity/Queue/QueueRow.js

@@ -97,6 +97,7 @@ class QueueRow extends Component {
       outputPath,
       downloadClient,
       estimatedCompletionTime,
+      added,
       timeleft,
       size,
       sizeleft,
@@ -315,6 +316,15 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'added') {
+              return (
+                <RelativeDateCellConnector
+                  key={name}
+                  date={added}
+                />
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <TableRowCell
@@ -393,6 +403,7 @@ QueueRow.propTypes = {
   outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
   estimatedCompletionTime: PropTypes.string,
+  added: PropTypes.string,
   timeleft: PropTypes.string,
   size: PropTypes.number,
   year: PropTypes.number,

frontend/src/Store/Actions/queueActions.js

@@ -147,6 +147,12 @@ export const defaultState = {
         isSortable: true,
         isVisible: true
       },
+      {
+        name: 'added',
+        label: () => translate('Added'),
+        isSortable: true,
+        isVisible: false
+      },
       {
         name: 'progress',
         label: () => translate('Progress'),

frontend/src/typings/Queue.ts

@@ -28,6 +28,7 @@ interface Queue extends ModelBase {
   sizeleft: number;
   timeleft: string;
   estimatedCompletionTime: string;
+  added?: string;
   status: string;
   trackedDownloadStatus: QueueTrackedDownloadStatus;
   trackedDownloadState: QueueTrackedDownloadState;

src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs

@@ -203,6 +203,7 @@ public List<RemoteMovie> GetPendingRemoteMovies(int movieId)
                         RemoteMovie = pendingRelease.RemoteMovie,
                         Timeleft = timeleft,
                         EstimatedCompletionTime = ect,
+                        Added = pendingRelease.Added,
                         Status = pendingRelease.Reason.ToString(),
                         Protocol = pendingRelease.RemoteMovie.Release.DownloadProtocol,
                         Indexer = pendingRelease.RemoteMovie.Release.Indexer

src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs

@@ -15,6 +15,7 @@ public class TrackedDownload
         public TrackedDownloadStatusMessage[] StatusMessages { get; private set; }
         public DownloadProtocol Protocol { get; set; }
         public string Indexer { get; set; }
+        public DateTime? Added { get; set; }
         public bool IsTrackable { get; set; }
         public bool HasNotifiedManualInteractionRequired { get; set; }
 

src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs

@@ -141,6 +141,7 @@ public TrackedDownload TrackDownload(DownloadClientDefinition downloadClient, Do
                     var grabbedEvent = historyItems.FirstOrDefault(v => v.EventType == MovieHistoryEventType.Grabbed);
 
                     trackedDownload.Indexer = grabbedEvent?.Data["indexer"];
+                    trackedDownload.Added = grabbedEvent?.Date;
 
                     if (parsedMovieInfo == null ||
                         trackedDownload.RemoteMovie == null ||

src/NzbDrone.Core/Queue/EstimatedCompletionTimeComparer.cs src/NzbDrone.Core/Queue/DatetimeComparer.cs

@@ -3,7 +3,7 @@
 
 namespace NzbDrone.Core.Queue
 {
-    public class EstimatedCompletionTimeComparer : IComparer<DateTime?>
+    public class DatetimeComparer : IComparer<DateTime?>
     {
         public int Compare(DateTime? x, DateTime? y)
         {

src/NzbDrone.Core/Queue/Queue.cs

@@ -20,6 +20,7 @@ public class Queue : ModelBase
         public decimal Sizeleft { get; set; }
         public TimeSpan? Timeleft { get; set; }
         public DateTime? EstimatedCompletionTime { get; set; }
+        public DateTime? Added { get; set; }
         public string Status { get; set; }
         public TrackedDownloadStatus? TrackedDownloadStatus { get; set; }
         public TrackedDownloadState? TrackedDownloadState { get; set; }

src/NzbDrone.Core/Queue/QueueService.cs

@@ -75,7 +75,8 @@ private Queue MapMovie(TrackedDownload trackedDownload, Movie movie)
                 Movie = movie,
                 DownloadClient = trackedDownload.DownloadItem.DownloadClientInfo.Name,
                 Indexer = trackedDownload.Indexer,
-                OutputPath = trackedDownload.DownloadItem.OutputPath.ToString()
+                OutputPath = trackedDownload.DownloadItem.OutputPath.ToString(),
+                Added = trackedDownload.Added
             };
 
             queue.Id = HashConverter.GetHashInt31($"trackedDownload-{trackedDownload.DownloadClient}-{trackedDownload.DownloadItem.DownloadId}");

src/Radarr.Api.V3/Queue/QueueController.cs

@@ -188,9 +188,16 @@ public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource
             else if (pagingSpec.SortKey == "estimatedCompletionTime")
             {
                 ordered = ascending
-                    ? fullQueue.OrderBy(q => q.EstimatedCompletionTime, new EstimatedCompletionTimeComparer())
+                    ? fullQueue.OrderBy(q => q.EstimatedCompletionTime, new DatetimeComparer())
                     : fullQueue.OrderByDescending(q => q.EstimatedCompletionTime,
-                        new EstimatedCompletionTimeComparer());
+                        new DatetimeComparer());
+            }
+            else if (pagingSpec.SortKey == "added")
+            {
+                ordered = ascending
+                    ? fullQueue.OrderBy(q => q.Added, new DatetimeComparer())
+                    : fullQueue.OrderByDescending(q => q.Added,
+                        new DatetimeComparer());
             }
             else if (pagingSpec.SortKey == "protocol")
             {

src/Radarr.Api.V3/Queue/QueueResource.cs

@@ -25,6 +25,7 @@ public class QueueResource : RestResource
         public decimal Sizeleft { get; set; }
         public TimeSpan? Timeleft { get; set; }
         public DateTime? EstimatedCompletionTime { get; set; }
+        public DateTime? Added { get; set; }
         public string Status { get; set; }
         public TrackedDownloadStatus? TrackedDownloadStatus { get; set; }
         public TrackedDownloadState? TrackedDownloadState { get; set; }
@@ -63,6 +64,7 @@ public static QueueResource ToResource(this NzbDrone.Core.Queue.Queue model, boo
                 Sizeleft = model.Sizeleft,
                 Timeleft = model.Timeleft,
                 EstimatedCompletionTime = model.EstimatedCompletionTime,
+                Added = model.Added,
                 Status = model.Status.FirstCharToLower(),
                 TrackedDownloadStatus = model.TrackedDownloadStatus,
                 TrackedDownloadState = model.TrackedDownloadState,