Sorted out the UI !wip

This commit is contained in:
Jamie 2018-12-05 21:24:50 +00:00
commit 4eeb5d4d35
7 changed files with 15 additions and 13 deletions

View file

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

View file

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

View file

@ -15,7 +15,7 @@ export class RequestRetryService extends ServiceHelpers {
public getFailedRequests(): Observable<IFailedRequestsViewModel[]> { public getFailedRequests(): Observable<IFailedRequestsViewModel[]> {
return this.http.get<IFailedRequestsViewModel[]>(this.url, {headers: this.headers}); return this.http.get<IFailedRequestsViewModel[]>(this.url, {headers: this.headers});
} }
public deleteFailedRequest(failedId: number): Observable<IFailedRequestsViewModel[]> { public deleteFailedRequest(failedId: number): Observable<boolean> {
return this.http.delete<IFailedRequestsViewModel[]>(`${this.url}/${failedId}`, {headers: this.headers}); return this.http.delete<boolean>(`${this.url}/${failedId}`, {headers: this.headers});
} }
} }

View file

@ -20,7 +20,7 @@
<td>{{RequestType[v.type] | humanize}}</td> <td>{{RequestType[v.type] | humanize}}</td>
<td class="vcenter">{{v.retryCount}}</td> <td class="vcenter">{{v.retryCount}}</td>
<td class="vcenter"> <i [pTooltip]="v.error" class="fa fa-info-circle"></i></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> </tr>
</tbody> </tbody>
</table> </table>

View file

@ -16,7 +16,12 @@ export class FailedRequestsComponent implements OnInit {
this.retry.getFailedRequests().subscribe(x => this.vm = x); this.retry.getFailedRequests().subscribe(x => this.vm = x);
} }
public remove(failedId: number) { public remove(failed: IFailedRequestsViewModel) {
this.retry.deleteFailedRequest(failedId).subscribe(); this.retry.deleteFailedRequest(failed.failedId).subscribe(x => {
if(x) {
const index = this.vm.indexOf(failed);
this.vm.splice(index,1);
}
});
} }
} }

View file

@ -84,6 +84,7 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/About']">About</a></li> <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/Update']">Update</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Jobs']">Jobs</a></li> <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Jobs']">Jobs</a></li>
<!-- <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Logs']">Logs (Not available)</a></li> <!-- <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Logs']">Logs (Not available)</a></li>

View file

@ -85,7 +85,7 @@ namespace Ombi.Controllers
{ {
var queueItem = await _requestQueueRepository.GetAll().FirstOrDefaultAsync(x => x.Id == queueId); var queueItem = await _requestQueueRepository.GetAll().FirstOrDefaultAsync(x => x.Id == queueId);
await _requestQueueRepository.Delete(queueItem); await _requestQueueRepository.Delete(queueItem);
return Ok(); return Json(true);
} }
} }