From 8f3dd86c520a3a6de657b1646681a7d1eedb678f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 3 Apr 2019 22:24:09 +0100 Subject: [PATCH] started on the admin panel --- .../card/discover-card-details.component.ts | 3 +- .../ClientApp/src/app/interfaces/IRadarr.ts | 10 +++ .../src/app/media-details/components/index.ts | 7 +- .../movie/movie-details.component.html | 79 ++++++++++++------- .../movie/movie-details.component.ts | 46 +---------- .../movie-admin-panel.component.html | 3 + .../movie-admin-panel.component.ts | 63 +++++++++++++++ .../movie-advanced-options.component.html | 21 +++++ .../movie-advanced-options.component.ts | 14 ++++ 9 files changed, 170 insertions(+), 76 deletions(-) create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.ts create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html create mode 100644 src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts b/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts index 31fd2a8d0..a92c2f961 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts @@ -20,7 +20,7 @@ export class DiscoverCardDetailsComponent implements OnInit { public tv: ISearchTvResultV2; public tvCreator: string; public tvProducer: string; - public loading: boolean;; + public loading: boolean; public RequestType = RequestType; constructor( @@ -77,7 +77,6 @@ export class DiscoverCardDetailsComponent implements OnInit { this.messageService.send(result.errorMessage, "Ok"); } } else if (this.data.type === RequestType.tvShow) { - this.dialog.open(EpisodeRequestComponent, { width: "700px", data: this.tv, panelClass: 'modal-panel' }) } this.loading = false; diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts b/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts index b643993f4..9370cc6e7 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts @@ -17,3 +17,13 @@ export interface IMinimumAvailability { value: string; name: string; } + +export interface IAdvancedModel { + profile: IRadarrProfile; + rootFolder: IRadarrRootFolder; +} + +export interface IAdvancedData { + profiles: IRadarrProfile[]; + rootFolders: IRadarrRootFolder[]; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/index.ts b/src/Ombi/ClientApp/src/app/media-details/components/index.ts index bb93feb82..aae142fa1 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/index.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/index.ts @@ -9,6 +9,8 @@ import { MediaPosterComponent } from "./shared/media-poster/media-poster.compone import { CastCarouselComponent } from "./shared/cast-carousel/cast-carousel.component"; import { DenyDialogComponent } from "./shared/deny-dialog/deny-dialog.component"; import { TvRequestsPanelComponent } from "./tv/panels/tv-requests/tv-requests-panel.component"; +import { MovieAdminPanelComponent } from "./movie/panels/movie-admin-panel/movie-admin-panel.component"; +import { MovieAdvancedOptionsComponent } from "./movie/panels/movie-advanced-options/movie-advanced-options.component"; export const components: any[] = [ MovieDetailsComponent, @@ -21,7 +23,9 @@ export const components: any[] = [ MediaPosterComponent, CastCarouselComponent, DenyDialogComponent, - TvRequestsPanelComponent + TvRequestsPanelComponent, + MovieAdminPanelComponent, + MovieAdvancedOptionsComponent ]; @@ -29,4 +33,5 @@ export const components: any[] = [ export const entryComponents: any[] = [ YoutubeTrailerComponent, DenyDialogComponent, + MovieAdvancedOptionsComponent, ]; diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index 458693977..e59b474ad 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -1,7 +1,11 @@ + +
- +
@@ -13,8 +17,9 @@
- @@ -28,13 +33,14 @@ - @@ -43,23 +49,26 @@ - - - - - - - - - +
@@ -67,13 +76,23 @@
- + + + + + + + + +
@@ -84,14 +103,12 @@ {{movie.overview}} - -
+
-
@@ -101,7 +118,7 @@ - {{'MediaDetails.RecommendationsTitle' | translate}} + {{'MediaDetails.RecommendationsTitle' | translate}} @@ -111,8 +128,9 @@
- Poster + Poster
@@ -123,7 +141,7 @@ - {{'MediaDetails.SimilarTitle' | translate}} + {{'MediaDetails.SimilarTitle' | translate}} @@ -133,8 +151,9 @@
- Poster + Poster
@@ -145,7 +164,7 @@ - {{'MediaDetails.VideosTitle' | translate}} + {{'MediaDetails.VideosTitle' | translate}} @@ -186,4 +205,4 @@ -
+ \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts index 0a568d442..b8a6c3e7b 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts @@ -1,12 +1,12 @@ import { Component, ViewEncapsulation } from "@angular/core"; -import { ImageService, SearchV2Service, RequestService, MessageService, RadarrService } from "../../../services"; +import { ImageService, SearchV2Service, RequestService, MessageService } from "../../../services"; import { ActivatedRoute } from "@angular/router"; import { DomSanitizer } from "@angular/platform-browser"; import { ISearchMovieResultV2 } from "../../../interfaces/ISearchMovieResultV2"; import { MatDialog } from "@angular/material"; import { YoutubeTrailerComponent } from "../shared/youtube-trailer.component"; import { AuthService } from "../../../auth/auth.service"; -import { IMovieRequests, IRadarrProfile, IRadarrRootFolder, RequestType } from "../../../interfaces"; +import { IMovieRequests, RequestType } from "../../../interfaces"; import { DenyDialogComponent } from "../shared/deny-dialog/deny-dialog.component"; @Component({ @@ -20,16 +20,12 @@ export class MovieDetailsComponent { public movieRequest: IMovieRequests; public isAdmin: boolean; - public radarrProfiles: IRadarrProfile[]; - public radarrRootFolders: IRadarrRootFolder[]; - private theMovidDbId: number; constructor(private searchService: SearchV2Service, private route: ActivatedRoute, private sanitizer: DomSanitizer, private imageService: ImageService, public dialog: MatDialog, private requestService: RequestService, - public messageService: MessageService, private auth: AuthService, - private radarrService: RadarrService) { + public messageService: MessageService, private auth: AuthService) { this.route.params.subscribe((params: any) => { this.theMovidDbId = params.movieDbId; this.load(); @@ -45,20 +41,6 @@ export class MovieDetailsComponent { // Load up this request this.hasRequest = true; this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId); - - if (this.isAdmin) { - if (await this.radarrService.isRadarrEnabled()) { - this.radarrService.getQualityProfilesFromSettings().subscribe(c => { - this.radarrProfiles = c; - this.setQualityOverrides(); - }); - this.radarrService.getRootFoldersFromSettings().subscribe(c => { - this.radarrRootFolders = c; - this.setRootFolderOverrides(); - }); - } - } - } this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe(x => { this.movie.background = this.sanitizer.bypassSecurityTrustStyle @@ -118,26 +100,4 @@ export class MovieDetailsComponent { this.messageService.send(result.errorMessage, "Ok"); } } - - private setQualityOverrides(): void { - if (this.radarrProfiles) { - const profile = this.radarrProfiles.filter((p) => { - return p.id === this.movieRequest.qualityOverride; - }); - if (profile.length > 0) { - this.movieRequest.qualityOverrideTitle = profile[0].name; - } - } - } - - private setRootFolderOverrides(): void { - if (this.radarrRootFolders) { - const path = this.radarrRootFolders.filter((folder) => { - return folder.id === this.movieRequest.rootPathOverride; - }); - if (path.length > 0) { - this.movieRequest.rootPathOverrideTitle = path[0].path; - } - } - } } diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html new file mode 100644 index 000000000..7d20cfc08 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.ts new file mode 100644 index 000000000..a67390364 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-admin-panel/movie-admin-panel.component.ts @@ -0,0 +1,63 @@ +import { Component, Input, OnInit } from "@angular/core"; +import { RadarrService } from "../../../../../services"; +import { IRadarrProfile, IRadarrRootFolder, IMovieRequests, IAdvancedData } from "../../../../../interfaces"; +import { MatDialog } from "@angular/material"; +import { MovieAdvancedOptionsComponent } from "../movie-advanced-options/movie-advanced-options.component"; + +@Component({ + templateUrl: "./movie-admin-panel.component.html", + selector: "movie-admin-panel", +}) +export class MovieAdminPanelComponent implements OnInit { + + @Input() public movie: IMovieRequests; + + public radarrProfiles: IRadarrProfile[]; + public selectedRadarrProfile: IRadarrProfile; + public radarrRootFolders: IRadarrRootFolder[]; + public selectRadarrRootFolders: IRadarrRootFolder; + + constructor(private radarrService: RadarrService, private dialog: MatDialog) { } + + public async ngOnInit() { + if (await this.radarrService.isRadarrEnabled()) { + this.radarrService.getQualityProfilesFromSettings().subscribe(c => { + this.radarrProfiles = c; + this.setQualityOverrides(); + }); + this.radarrService.getRootFoldersFromSettings().subscribe(c => { + this.radarrRootFolders = c; + this.setRootFolderOverrides(); + }); + } + } + + public openAdvancedOptions() { + const dialog = this.dialog.open(MovieAdvancedOptionsComponent, { width: "700px", data: { profiles: this.radarrProfiles, rootFolders: this.radarrRootFolders }, panelClass: 'modal-panel' }) + dialog.afterClosed().subscribe(result => { + console.log(result); + }); + } + + private setQualityOverrides(): void { + if (this.radarrProfiles) { + const profile = this.radarrProfiles.filter((p) => { + return p.id === this.movie.qualityOverride; + }); + if (profile.length > 0) { + this.movie.qualityOverrideTitle = profile[0].name; + } + } + } + + private setRootFolderOverrides(): void { + if (this.radarrRootFolders) { + const path = this.radarrRootFolders.filter((folder) => { + return folder.id === this.movie.rootPathOverride; + }); + if (path.length > 0) { + this.movie.rootPathOverrideTitle = path[0].path; + } + } + } +} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html new file mode 100644 index 000000000..8c438cce5 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html @@ -0,0 +1,21 @@ + + +

Advanced Options

+
+ + Radarr Quality Profile + + {{profile.name}} + + + + + Radarr Root Folders + + {{profile.path}} + + +
+
+ +
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts new file mode 100644 index 000000000..93d0d7061 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.ts @@ -0,0 +1,14 @@ +import { Component, Inject } from "@angular/core"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material"; +import { IAdvancedModel, IAdvancedData } from "../../../../../interfaces"; + +@Component({ + templateUrl: "./movie-advanced-options.component.html", + selector: "movie-advanced-options", +}) +export class MovieAdvancedOptionsComponent { + + public options: IAdvancedModel; + + constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData) { } +}