From ecb37b8378220c2d0e8cd9a28a01badf8fd8d599 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 6 Nov 2023 17:39:42 +0200 Subject: [PATCH] Fixed: Showing already imported tracks as downloading in Artists index (cherry picked from commit 8c3a0ebabae163274b7587afe1f998edb39c5184) --- .../Index/createArtistQueueDetailsSelector.ts | 5 ++++- frontend/src/typings/Queue.ts | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/frontend/src/Artist/Index/createArtistQueueDetailsSelector.ts b/frontend/src/Artist/Index/createArtistQueueDetailsSelector.ts index d831fa797c..34a9c39103 100644 --- a/frontend/src/Artist/Index/createArtistQueueDetailsSelector.ts +++ b/frontend/src/Artist/Index/createArtistQueueDetailsSelector.ts @@ -12,7 +12,10 @@ function createArtistQueueDetailsSelector(artistId: number) { (queueItems) => { return queueItems.reduce( (acc: ArtistQueueDetails, item) => { - if (item.artistId !== artistId) { + if ( + item.trackedDownloadState === 'imported' || + item.artistId !== artistId + ) { return acc; } diff --git a/frontend/src/typings/Queue.ts b/frontend/src/typings/Queue.ts index 2a3c239a4f..46afdaa7a7 100644 --- a/frontend/src/typings/Queue.ts +++ b/frontend/src/typings/Queue.ts @@ -2,6 +2,18 @@ import ModelBase from 'App/ModelBase'; import { QualityModel } from 'Quality/Quality'; import CustomFormat from 'typings/CustomFormat'; +export type QueueTrackedDownloadStatus = 'ok' | 'warning' | 'error'; + +export type QueueTrackedDownloadState = + | 'downloading' + | 'downloadFailed' + | 'downloadFailedPending' + | 'importPending' + | 'importing' + | 'importFailed' + | 'imported' + | 'ignored'; + export interface StatusMessage { title: string; messages: string[]; @@ -17,8 +29,8 @@ interface Queue extends ModelBase { estimatedCompletionTime: string; added?: string; status: string; - trackedDownloadStatus: string; - trackedDownloadState: string; + trackedDownloadStatus: QueueTrackedDownloadStatus; + trackedDownloadState: QueueTrackedDownloadState; statusMessages: StatusMessage[]; errorMessage: string; downloadId: string;