From 14c02c78823ddc7c4379ea178ef76d91cde2edb9 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Sun, 3 Dec 2023 19:44:16 +0200
Subject: [PATCH] Fixed: Toggling monitor artist multiple times

---
 frontend/src/Artist/Details/ArtistDetails.js | 4 ++--
 src/Lidarr.Api.V1/Artist/ArtistController.cs | 8 ++++++--
 src/Lidarr.Api.V1/Artist/ArtistResource.cs   | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js
index a04577836..f3ac56a15 100644
--- a/frontend/src/Artist/Details/ArtistDetails.js
+++ b/frontend/src/Artist/Details/ArtistDetails.js
@@ -524,7 +524,7 @@ class ArtistDetails extends Component {
                     />
 
                     <span className={styles.qualityProfileName}>
-                      {monitored ? 'Monitored' : 'Unmonitored'}
+                      {monitored ? translate('Monitored') : translate('Unmonitored')}
                     </span>
                   </Label>
 
@@ -539,7 +539,7 @@ class ArtistDetails extends Component {
                     />
 
                     <span className={styles.qualityProfileName}>
-                      {continuing ? 'Continuing' : endedString}
+                      {continuing ? translate('Continuing') : endedString}
                     </span>
                   </Label>
 
diff --git a/src/Lidarr.Api.V1/Artist/ArtistController.cs b/src/Lidarr.Api.V1/Artist/ArtistController.cs
index b3883cae9..41bd3f30f 100644
--- a/src/Lidarr.Api.V1/Artist/ArtistController.cs
+++ b/src/Lidarr.Api.V1/Artist/ArtistController.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
+using Lidarr.Api.V1.Albums;
 using Lidarr.Http;
 using Lidarr.Http.REST;
 using Lidarr.Http.REST.Attributes;
@@ -127,6 +128,7 @@ namespace Lidarr.Api.V1.Artist
         }
 
         [HttpGet]
+        [Produces("application/json")]
         public List<ArtistResource> AllArtists(Guid? mbId)
         {
             var artistStats = _artistStatisticsService.ArtistStatistics();
@@ -151,6 +153,7 @@ namespace Lidarr.Api.V1.Artist
         }
 
         [RestPostById]
+        [Consumes("application/json")]
         public ActionResult<ArtistResource> AddArtist(ArtistResource artistResource)
         {
             var artist = _addArtistService.AddArtist(artistResource.ToModel());
@@ -159,6 +162,7 @@ namespace Lidarr.Api.V1.Artist
         }
 
         [RestPutById]
+        [Consumes("application/json")]
         public ActionResult<ArtistResource> UpdateArtist(ArtistResource artistResource, bool moveFiles = false)
         {
             var artist = _artistService.GetArtist(artistResource.Id);
@@ -205,8 +209,8 @@ namespace Lidarr.Api.V1.Artist
 
             foreach (var artistResource in artists)
             {
-                artistResource.NextAlbum = nextAlbums.FirstOrDefault(x => x.ArtistMetadataId == artistResource.ArtistMetadataId);
-                artistResource.LastAlbum = lastAlbums.FirstOrDefault(x => x.ArtistMetadataId == artistResource.ArtistMetadataId);
+                artistResource.NextAlbum = nextAlbums.FirstOrDefault(x => x.ArtistMetadataId == artistResource.ArtistMetadataId).ToResource();
+                artistResource.LastAlbum = lastAlbums.FirstOrDefault(x => x.ArtistMetadataId == artistResource.ArtistMetadataId).ToResource();
             }
         }
 
diff --git a/src/Lidarr.Api.V1/Artist/ArtistResource.cs b/src/Lidarr.Api.V1/Artist/ArtistResource.cs
index 0c09f9825..288208fcf 100644
--- a/src/Lidarr.Api.V1/Artist/ArtistResource.cs
+++ b/src/Lidarr.Api.V1/Artist/ArtistResource.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Lidarr.Api.V1.Albums;
 using Lidarr.Http.REST;
 using Newtonsoft.Json;
 using NzbDrone.Common.Extensions;
@@ -31,8 +32,8 @@ namespace Lidarr.Api.V1.Artist
         public string Disambiguation { get; set; }
         public List<Links> Links { get; set; }
 
-        public Album NextAlbum { get; set; }
-        public Album LastAlbum { get; set; }
+        public AlbumResource NextAlbum { get; set; }
+        public AlbumResource LastAlbum { get; set; }
 
         public List<MediaCover> Images { get; set; }
         public List<Member> Members { get; set; }