mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-20 21:33:15 -07:00
Added bulk approve and delete on the movie requests list page, tv and music coming next
This commit is contained in:
parent
db1266eab6
commit
278467cc0c
6 changed files with 108 additions and 17 deletions
|
@ -12,7 +12,7 @@ import { NewIssueComponent } from "../shared/new-issue/new-issue.component";
|
||||||
import { MovieAdvancedOptionsComponent } from "./panels/movie-advanced-options/movie-advanced-options.component";
|
import { MovieAdvancedOptionsComponent } from "./panels/movie-advanced-options/movie-advanced-options.component";
|
||||||
import { RequestServiceV2 } from "../../../services/requestV2.service";
|
import { RequestServiceV2 } from "../../../services/requestV2.service";
|
||||||
import { RequestBehalfComponent } from "../shared/request-behalf/request-behalf.component";
|
import { RequestBehalfComponent } from "../shared/request-behalf/request-behalf.component";
|
||||||
import { Observable, forkJoin } from "rxjs";
|
import { forkJoin } from "rxjs";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
templateUrl: "./movie-details.component.html",
|
templateUrl: "./movie-details.component.html",
|
||||||
|
|
|
@ -30,6 +30,20 @@
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<table mat-table [dataSource]="dataSource" class="requests table" matSort [matSortActive]="defaultSort" matSortDisableClear [matSortDirection]="defaultOrder">
|
<table mat-table [dataSource]="dataSource" class="requests table" matSort [matSortActive]="defaultSort" matSortDisableClear [matSortDirection]="defaultOrder">
|
||||||
|
|
||||||
|
<ng-container matColumnDef="select" *ngIf="isAdmin">
|
||||||
|
<th mat-header-cell *matHeaderCellDef>
|
||||||
|
<mat-checkbox (change)="$event ? masterToggle() : null"
|
||||||
|
[checked]="selection.hasValue() && isAllSelected()"
|
||||||
|
[indeterminate]="selection.hasValue() && !isAllSelected()">
|
||||||
|
</mat-checkbox>
|
||||||
|
</th>
|
||||||
|
<td mat-cell *matCellDef="let row">
|
||||||
|
<mat-checkbox (click)="$event.stopPropagation()"
|
||||||
|
(change)="$event ? selection.toggle(row) : null"
|
||||||
|
[checked]="selection.isSelected(row)">
|
||||||
|
</mat-checkbox>
|
||||||
|
</td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
<ng-container matColumnDef="title">
|
<ng-container matColumnDef="title">
|
||||||
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestsTitle' | translate}} </th>
|
<th mat-header-cell *matHeaderCellDef mat-sort-header disableClear> {{ 'Requests.RequestsTitle' | translate}} </th>
|
||||||
|
@ -72,3 +86,10 @@
|
||||||
|
|
||||||
<mat-paginator [length]="resultsLength" [pageSize]="gridCount"></mat-paginator>
|
<mat-paginator [length]="resultsLength" [pageSize]="gridCount"></mat-paginator>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<button *ngIf="selection.hasValue() && isAdmin" mat-fab color="accent" class="floating-fab" [matMenuTriggerFor]="aboveMenu">
|
||||||
|
<mat-icon>add</mat-icon></button>
|
||||||
|
<mat-menu #aboveMenu="matMenu" yPosition="above">
|
||||||
|
<button mat-menu-item (click)="bulkDelete()">{{'Requests.RequestPanel.Delete' | translate}}</button>
|
||||||
|
<button mat-menu-item (click)="bulkApprove()">{{'Requests.RequestPanel.Approve' | translate}}</button>
|
||||||
|
</mat-menu>
|
|
@ -1,14 +1,18 @@
|
||||||
import { Component, AfterViewInit, ViewChild, EventEmitter, Output, ChangeDetectorRef, OnInit } from "@angular/core";
|
import { Component, AfterViewInit, ViewChild, EventEmitter, Output, ChangeDetectorRef, OnInit } from "@angular/core";
|
||||||
import { IMovieRequests, IRequestsViewModel } from "../../../interfaces";
|
import { IMovieRequests, IRequestEngineResult, IRequestsViewModel } from "../../../interfaces";
|
||||||
import { MatPaginator } from "@angular/material/paginator";
|
import { MatPaginator } from "@angular/material/paginator";
|
||||||
import { MatSort } from "@angular/material/sort";
|
import { MatSort } from "@angular/material/sort";
|
||||||
import { merge, Observable, of as observableOf } from 'rxjs';
|
import { merge, Observable, of as observableOf, forkJoin } from 'rxjs';
|
||||||
import { catchError, map, startWith, switchMap } from 'rxjs/operators';
|
import { catchError, map, startWith, switchMap } from 'rxjs/operators';
|
||||||
|
|
||||||
import { RequestServiceV2 } from "../../../services/requestV2.service";
|
import { RequestServiceV2 } from "../../../services/requestV2.service";
|
||||||
import { AuthService } from "../../../auth/auth.service";
|
import { AuthService } from "../../../auth/auth.service";
|
||||||
import { StorageService } from "../../../shared/storage/storage-service";
|
import { StorageService } from "../../../shared/storage/storage-service";
|
||||||
import { RequestFilterType } from "../../models/RequestFilterType";
|
import { RequestFilterType } from "../../models/RequestFilterType";
|
||||||
|
import { SelectionModel } from "@angular/cdk/collections";
|
||||||
|
import { NotificationService, RequestService } from "../../../services";
|
||||||
|
import { TranslateService } from "@ngx-translate/core";
|
||||||
|
import { MatTableDataSource } from "@angular/material/table";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
templateUrl: "./movies-grid.component.html",
|
templateUrl: "./movies-grid.component.html",
|
||||||
|
@ -16,7 +20,7 @@ import { RequestFilterType } from "../../models/RequestFilterType";
|
||||||
styleUrls: ["./movies-grid.component.scss"]
|
styleUrls: ["./movies-grid.component.scss"]
|
||||||
})
|
})
|
||||||
export class MoviesGridComponent implements OnInit, AfterViewInit {
|
export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
public dataSource: IMovieRequests[] = [];
|
public dataSource: MatTableDataSource<IMovieRequests>;
|
||||||
public resultsLength: number;
|
public resultsLength: number;
|
||||||
public isLoadingResults = true;
|
public isLoadingResults = true;
|
||||||
public displayedColumns: string[] = ['title', 'requestedUser.requestedBy', 'status', 'requestStatus','requestedDate', 'actions'];
|
public displayedColumns: string[] = ['title', 'requestedUser.requestedBy', 'status', 'requestStatus','requestedDate', 'actions'];
|
||||||
|
@ -25,6 +29,7 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
public defaultSort: string = "requestedDate";
|
public defaultSort: string = "requestedDate";
|
||||||
public defaultOrder: string = "desc";
|
public defaultOrder: string = "desc";
|
||||||
public currentFilter: RequestFilterType = RequestFilterType.All;
|
public currentFilter: RequestFilterType = RequestFilterType.All;
|
||||||
|
public selection = new SelectionModel<IMovieRequests>(true, []);
|
||||||
|
|
||||||
public RequestFilter = RequestFilterType;
|
public RequestFilter = RequestFilterType;
|
||||||
|
|
||||||
|
@ -40,13 +45,17 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
@ViewChild(MatSort) sort: MatSort;
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
|
|
||||||
constructor(private requestService: RequestServiceV2, private ref: ChangeDetectorRef,
|
constructor(private requestService: RequestServiceV2, private ref: ChangeDetectorRef,
|
||||||
private auth: AuthService, private storageService: StorageService) {
|
private auth: AuthService, private storageService: StorageService,
|
||||||
|
private requestServiceV1: RequestService, private notification: NotificationService,
|
||||||
|
private translateService: TranslateService) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ngOnInit() {
|
public ngOnInit() {
|
||||||
this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
|
this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
|
||||||
|
if (this.isAdmin) {
|
||||||
|
this.displayedColumns.unshift('select');
|
||||||
|
}
|
||||||
const defaultCount = this.storageService.get(this.storageKeyGridCount);
|
const defaultCount = this.storageService.get(this.storageKeyGridCount);
|
||||||
const defaultSort = this.storageService.get(this.storageKey);
|
const defaultSort = this.storageService.get(this.storageKey);
|
||||||
const defaultOrder = this.storageService.get(this.storageKeyOrder);
|
const defaultOrder = this.storageService.get(this.storageKeyOrder);
|
||||||
|
@ -96,7 +105,7 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
this.isLoadingResults = false;
|
this.isLoadingResults = false;
|
||||||
return observableOf([]);
|
return observableOf([]);
|
||||||
})
|
})
|
||||||
).subscribe(data => this.dataSource = data);
|
).subscribe(data => this.dataSource = new MatTableDataSource(data));
|
||||||
}
|
}
|
||||||
|
|
||||||
public loadData(): Observable<IRequestsViewModel<IMovieRequests>> {
|
public loadData(): Observable<IRequestsViewModel<IMovieRequests>> {
|
||||||
|
@ -117,9 +126,9 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
|
|
||||||
public openOptions(request: IMovieRequests) {
|
public openOptions(request: IMovieRequests) {
|
||||||
const filter = () => {
|
const filter = () => {
|
||||||
this.dataSource = this.dataSource.filter((req) => {
|
this.dataSource.data = this.dataSource.data.filter((req) => {
|
||||||
return req.id !== request.id;
|
return req.id !== request.id;
|
||||||
})
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const onChange = () => {
|
const onChange = () => {
|
||||||
|
@ -133,4 +142,56 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
|
||||||
this.currentFilter = type;
|
this.currentFilter = type;
|
||||||
this.ngAfterViewInit();
|
this.ngAfterViewInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public isAllSelected() {
|
||||||
|
const numSelected = this.selection.selected.length;
|
||||||
|
const numRows = this.dataSource.data.length;
|
||||||
|
return numSelected === numRows;
|
||||||
|
}
|
||||||
|
|
||||||
|
public masterToggle() {
|
||||||
|
this.isAllSelected() ?
|
||||||
|
this.selection.clear() :
|
||||||
|
this.dataSource.data.forEach(row => this.selection.select(row));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async bulkDelete() {
|
||||||
|
if (this.selection.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let tasks = new Array();
|
||||||
|
this.selection.selected.forEach((selected) => {
|
||||||
|
tasks.push(this.requestServiceV1.removeMovieRequestAsync(selected.id));
|
||||||
|
});
|
||||||
|
|
||||||
|
await Promise.all(tasks);
|
||||||
|
|
||||||
|
this.notification.success(this.translateService.instant('Requests.RequestPanel.Deleted'))
|
||||||
|
this.selection.clear();
|
||||||
|
this.ngAfterViewInit();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bulkApprove() {
|
||||||
|
if (this.selection.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let tasks = new Array<Observable<IRequestEngineResult>>();
|
||||||
|
this.selection.selected.forEach((selected) => {
|
||||||
|
tasks.push(this.requestServiceV1.approveMovie({ id: selected.id }));
|
||||||
|
});
|
||||||
|
|
||||||
|
this.isLoadingResults = true;
|
||||||
|
forkJoin(tasks).subscribe((result: IRequestEngineResult[]) => {
|
||||||
|
this.isLoadingResults = false;
|
||||||
|
const failed = result.filter(x => !x.result);
|
||||||
|
if(failed.length > 0) {
|
||||||
|
this.notification.error("Some requests failed to approve: " + failed[0].errorMessage);
|
||||||
|
this.selection.clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.notification.success(this.translateService.instant('Requests.RequestPanel.Approved'));
|
||||||
|
this.selection.clear();
|
||||||
|
this.ngAfterViewInit();
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -63,3 +63,10 @@
|
||||||
::ng-deep table.requests button{
|
::ng-deep table.requests button{
|
||||||
margin:5px;
|
margin:5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::ng-deep .floating-fab {
|
||||||
|
position: fixed;
|
||||||
|
right: 3%;
|
||||||
|
bottom: 6%;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
|
@ -180,7 +180,9 @@
|
||||||
"RequestPanel": {
|
"RequestPanel": {
|
||||||
"Delete":"Delete Request",
|
"Delete":"Delete Request",
|
||||||
"Approve":"Approve Request",
|
"Approve":"Approve Request",
|
||||||
"ChangeAvailability":"Mark Available"
|
"ChangeAvailability":"Mark Available",
|
||||||
|
"Deleted": "Successfully deleted selected items",
|
||||||
|
"Approved": "Successfully approved selected items"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Issues": {
|
"Issues": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue