From 6dccea77c2bcad5719dda4d18f7370c8b310a990 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sat, 6 Apr 2019 23:56:55 +0100
Subject: [PATCH] Fixed the mixed content warnings and the error when removing
 a album request #2884

---
 src/Ombi.Core/Engine/MusicSearchEngine.cs             |  5 +++--
 src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs   |  1 +
 .../app/requests/music/musicrequests.component.ts     | 11 +++++------
 src/Ombi/ClientApp/app/services/request.service.ts    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Ombi.Core/Engine/MusicSearchEngine.cs b/src/Ombi.Core/Engine/MusicSearchEngine.cs
index d0e577801..16f727da7 100644
--- a/src/Ombi.Core/Engine/MusicSearchEngine.cs
+++ b/src/Ombi.Core/Engine/MusicSearchEngine.cs
@@ -152,7 +152,8 @@ namespace Ombi.Core.Engine
                 Rating = a.ratings?.value ?? 0m,
                 ReleaseDate = a.releaseDate,
                 Title = a.title,
-                Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url
+                Disk = a.images?.FirstOrDefault(x => x.coverType.Equals("disc"))?.url?.Replace("http","https"),
+                Genres = a.genres
             };
             if (a.artistId > 0)
             {
@@ -169,7 +170,7 @@ namespace Ombi.Core.Engine
                 vm.ArtistName = a.artist?.artistName;
             }
 
-            vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url;
+            vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url?.Replace("http", "https");
             if (vm.Cover.IsNullOrEmpty())
             {
                 vm.Cover = a.remoteCover;
diff --git a/src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs b/src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs
index a494a3cb5..3823d7789 100644
--- a/src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs
+++ b/src/Ombi.Core/Models/Search/SearchAlbumViewModel.cs
@@ -16,6 +16,7 @@ namespace Ombi.Core.Models.Search
         public string Cover { get; set; }
         public string Disk { get; set; }
         public decimal PercentOfTracks { get; set; }
+        public object[] Genres { get; set; }
         public override RequestType Type => RequestType.Album;
         public bool PartiallyAvailable => PercentOfTracks != 100 && PercentOfTracks > 0;
         public bool FullyAvailable => PercentOfTracks == 100;
diff --git a/src/Ombi/ClientApp/app/requests/music/musicrequests.component.ts b/src/Ombi/ClientApp/app/requests/music/musicrequests.component.ts
index b10173042..2bc7b6282 100644
--- a/src/Ombi/ClientApp/app/requests/music/musicrequests.component.ts
+++ b/src/Ombi/ClientApp/app/requests/music/musicrequests.component.ts
@@ -90,11 +90,10 @@ export class MusicRequestsComponent implements OnInit {
         this.searchChanged.next(text.target.value);
     }
 
-    public removeRequest(request: IAlbumRequest) {
-        this.requestService.removeAlbumRequest(request).subscribe(x => {
-            this.removeRequestFromUi(request);
-            this.loadRequests(this.amountToLoad, this.currentlyLoaded = 0);
-        });
+    public async removeRequest(request: IAlbumRequest) {
+        await this.requestService.removeAlbumRequest(request).toPromise();
+        this.removeRequestFromUi(request);
+        this.loadRequests(this.amountToLoad, this.currentlyLoaded = 0);
     }
 
     public changeAvailability(request: IAlbumRequest, available: boolean) {
@@ -335,7 +334,7 @@ export class MusicRequestsComponent implements OnInit {
     }
     private setAlbumBackground(req: IAlbumRequest) {
         if (req.disk === null) {
-            if(req.cover === null) {
+            if (req.cover === null) {
                 req.disk = this.defaultPoster;
             } else {
                 req.disk = req.cover;
diff --git a/src/Ombi/ClientApp/app/services/request.service.ts b/src/Ombi/ClientApp/app/services/request.service.ts
index f7e2b3875..5353ea580 100644
--- a/src/Ombi/ClientApp/app/services/request.service.ts
+++ b/src/Ombi/ClientApp/app/services/request.service.ts
@@ -182,7 +182,7 @@ export class RequestService extends ServiceHelpers {
     }
 
     public removeAlbumRequest(request: IAlbumRequest): any {
-        this.http.delete(`${this.url}music/${request.id}`, {headers: this.headers}).subscribe();
+        return this.http.delete(`${this.url}music/${request.id}`, {headers: this.headers});
     }
 
 }