From 4eeb5d4d355cd89025ba53471e53243ffa1215f1 Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Wed, 5 Dec 2018 21:24:50 +0000
Subject: [PATCH] Sorted out the UI !wip

---
 src/Ombi.Store/Entities/RequestType.cs                   | 6 +-----
 src/Ombi/ClientApp/app/interfaces/IRequestModel.ts       | 4 ++--
 src/Ombi/ClientApp/app/services/requestretry.service.ts  | 4 ++--
 .../settings/failedrequests/failedrequest.component.html | 2 +-
 .../settings/failedrequests/failedrequests.component.ts  | 9 +++++++--
 .../ClientApp/app/settings/settingsmenu.component.html   | 1 +
 src/Ombi/Controllers/RequestRetryController.cs           | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/Ombi.Store/Entities/RequestType.cs b/src/Ombi.Store/Entities/RequestType.cs
index 151453bdd..4d2d20ac4 100644
--- a/src/Ombi.Store/Entities/RequestType.cs
+++ b/src/Ombi.Store/Entities/RequestType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Ombi.Store.Entities
+namespace Ombi.Store.Entities
 {
     public enum RequestType
     {
diff --git a/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts
index 5a72abf31..b083ca088 100644
--- a/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts
+++ b/src/Ombi/ClientApp/app/interfaces/IRequestModel.ts
@@ -1,9 +1,9 @@
 import { IUser } from "./IUser";
 
 export enum RequestType {
+  tvShow = 0,
   movie = 1,
-  tvShow = 2,
-  album = 3,
+  album = 2,
 }
 
 // NEW WORLD
diff --git a/src/Ombi/ClientApp/app/services/requestretry.service.ts b/src/Ombi/ClientApp/app/services/requestretry.service.ts
index 9803f73f7..e5c9cabe0 100644
--- a/src/Ombi/ClientApp/app/services/requestretry.service.ts
+++ b/src/Ombi/ClientApp/app/services/requestretry.service.ts
@@ -15,7 +15,7 @@ export class RequestRetryService extends ServiceHelpers {
     public getFailedRequests(): Observable<IFailedRequestsViewModel[]> {
         return this.http.get<IFailedRequestsViewModel[]>(this.url, {headers: this.headers});
     }
-    public deleteFailedRequest(failedId: number): Observable<IFailedRequestsViewModel[]> {
-        return this.http.delete<IFailedRequestsViewModel[]>(`${this.url}/${failedId}`, {headers: this.headers});
+    public deleteFailedRequest(failedId: number): Observable<boolean> {
+        return this.http.delete<boolean>(`${this.url}/${failedId}`, {headers: this.headers});
     }
 }
diff --git a/src/Ombi/ClientApp/app/settings/failedrequests/failedrequest.component.html b/src/Ombi/ClientApp/app/settings/failedrequests/failedrequest.component.html
index c0cc2ca1e..898710199 100644
--- a/src/Ombi/ClientApp/app/settings/failedrequests/failedrequest.component.html
+++ b/src/Ombi/ClientApp/app/settings/failedrequests/failedrequest.component.html
@@ -20,7 +20,7 @@
             <td>{{RequestType[v.type] | humanize}}</td>
             <td class="vcenter">{{v.retryCount}}</td>
             <td class="vcenter"> <i [pTooltip]="v.error" class="fa fa-info-circle"></i></td>
-            <td class="vcenter"><button class="btn btn-primary" (click)="remove(v.failedId)">Remove</button></td>
+            <td class="vcenter"><button class="btn btn-sm btn-danger-outline" (click)="remove(v)">Remove</button></td>
         </tr>
     </tbody>
 </table>
diff --git a/src/Ombi/ClientApp/app/settings/failedrequests/failedrequests.component.ts b/src/Ombi/ClientApp/app/settings/failedrequests/failedrequests.component.ts
index 65be04a22..a303ac713 100644
--- a/src/Ombi/ClientApp/app/settings/failedrequests/failedrequests.component.ts
+++ b/src/Ombi/ClientApp/app/settings/failedrequests/failedrequests.component.ts
@@ -16,7 +16,12 @@ export class FailedRequestsComponent implements OnInit {
         this.retry.getFailedRequests().subscribe(x => this.vm = x);
     }
 
-    public remove(failedId: number) {
-        this.retry.deleteFailedRequest(failedId).subscribe();
+    public remove(failed: IFailedRequestsViewModel) {
+        this.retry.deleteFailedRequest(failed.failedId).subscribe(x => {
+            if(x) {
+                const index = this.vm.indexOf(failed);
+                this.vm.splice(index,1);
+            }
+        });
     }
 }
diff --git a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html
index 59ce35c32..eae56bce2 100644
--- a/src/Ombi/ClientApp/app/settings/settingsmenu.component.html
+++ b/src/Ombi/ClientApp/app/settings/settingsmenu.component.html
@@ -84,6 +84,7 @@
         </a>
         <ul class="dropdown-menu">
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/About']">About</a></li>
+            <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/FailedRequests']">Failed Requests</a></li>
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Update']">Update</a></li>
             <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Jobs']">Jobs</a></li>
             <!-- <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Logs']">Logs (Not available)</a></li>
diff --git a/src/Ombi/Controllers/RequestRetryController.cs b/src/Ombi/Controllers/RequestRetryController.cs
index 6a53f9732..b8ad2759e 100644
--- a/src/Ombi/Controllers/RequestRetryController.cs
+++ b/src/Ombi/Controllers/RequestRetryController.cs
@@ -85,7 +85,7 @@ namespace Ombi.Controllers
         {
             var queueItem = await _requestQueueRepository.GetAll().FirstOrDefaultAsync(x => x.Id == queueId);
             await _requestQueueRepository.Delete(queueItem);
-            return Ok();
+            return Json(true);
         }
 
     }