Sorted out the UI !wip

pull/2672/head
Jamie 6 years ago
parent 9d2fc81a0c
commit 4eeb5d4d35

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Ombi.Store.Entities
namespace Ombi.Store.Entities
{
public enum RequestType
{

@ -1,9 +1,9 @@
import { IUser } from "./IUser";
export enum RequestType {
tvShow = 0,
movie = 1,
tvShow = 2,
album = 3,
album = 2,
}
// NEW WORLD

@ -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});
}
}

@ -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>

@ -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);
}
});
}
}

@ -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>

@ -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);
}
}

Loading…
Cancel
Save