From 59106dca0f6f8bdc93a188e8eb60038ac69e2a87 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 15 Mar 2021 22:13:44 +0000 Subject: [PATCH] Small fixes --- .../Search/V2/SearchFullInfoTvShowViewModel.cs | 1 + src/Ombi.Mapping/Profiles/TvProfileV2.cs | 13 +++++++------ .../components/actor/discover-actor.component.ts | 2 +- .../panels/movie-information-panel.component.html | 6 +++--- .../cast-carousel/cast-carousel.component.html | 8 ++++---- .../tv-request-grid/tv-request-grid.component.html | 4 ++-- .../tv-request-grid/tv-request-grid.component.ts | 3 ++- .../details/tv/tvdetails-requests-grid.spec.ts | 8 +++++++- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/Ombi.Core/Models/Search/V2/SearchFullInfoTvShowViewModel.cs b/src/Ombi.Core/Models/Search/V2/SearchFullInfoTvShowViewModel.cs index 480a1273b..0902c1fb1 100644 --- a/src/Ombi.Core/Models/Search/V2/SearchFullInfoTvShowViewModel.cs +++ b/src/Ombi.Core/Models/Search/V2/SearchFullInfoTvShowViewModel.cs @@ -73,6 +73,7 @@ namespace Ombi.Core.Models.Search.V2 public class CastViewModel { + public int Id { get; set; } public string Person { get; set; } public string Character { get; set; } public string Image { get; set; } diff --git a/src/Ombi.Mapping/Profiles/TvProfileV2.cs b/src/Ombi.Mapping/Profiles/TvProfileV2.cs index 83b75189c..51e2ac94b 100644 --- a/src/Ombi.Mapping/Profiles/TvProfileV2.cs +++ b/src/Ombi.Mapping/Profiles/TvProfileV2.cs @@ -97,16 +97,17 @@ namespace Ombi.Mapping.Profiles // .ForMember(dest => dest.Medium, opts => opts.MapFrom(src => src.medium.ToHttpsUrl())) // .ForMember(dest => dest.Original, opts => opts.MapFrom(src => src.original.ToHttpsUrl())); - CreateMap() - .ForMember(dest => dest.Character, opts => opts.MapFrom(src => src.character)) - .ForMember(dest => dest.Person, opts => opts.MapFrom(src => src.person)) - .ForMember(dest => dest.Voice, opts => opts.MapFrom(src => src.voice)) - .ForMember(dest => dest.Self, opts => opts.MapFrom(src => src.self)); + //CreateMap() + // .ForMember(dest => dest.Character, opts => opts.MapFrom(src => src.character)) + // .ForMember(dest => dest.Person, opts => opts.MapFrom(src => src.person)) + // .ForMember(dest => dest.Voice, opts => opts.MapFrom(src => src.voice)) + // .ForMember(dest => dest.Self, opts => opts.MapFrom(src => src.self)); CreateMap() .ForMember(dest => dest.Character, opts => opts.MapFrom(src => src.character)) .ForMember(dest => dest.Person, opts => opts.MapFrom(src => src.name)) - .ForMember(dest => dest.Image, opts => opts.MapFrom(src => src.profile_path)); + .ForMember(dest => dest.Image, opts => opts.MapFrom(src => src.profile_path)) + .ForMember(dest => dest.Id, opts => opts.MapFrom(src => src.id)); CreateMap() .ForMember(dest => dest.Id, opts => opts.MapFrom(src => src.id)) diff --git a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts index 4a06b22d8..83d4d364c 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts @@ -15,7 +15,7 @@ export class DiscoverActorComponent implements AfterViewInit { public loadingFlag: boolean; public discoverResults: IDiscoverCardResult[] = []; - + constructor(private searchService: SearchV2Service, private route: ActivatedRoute) { this.route.params.subscribe((params: any) => { diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html index b14e2d44a..eb7f538c0 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html @@ -2,16 +2,16 @@
- {{movie.voteAverage | number:'1.0-1'}}/10 + {{movie.voteAverage | number:'1.0-1'}}/10 + src="{{baseUrl}}images/{{ratings.critics_rating === 'Rotten' ? 'rotten-rotten.svg' : 'rotten-fresh.svg'}}"> {{ratings.critics_score}}% + src="{{baseUrl}}images/{{ratings.audience_rating === 'Upright' ? 'rotten-audience-fresh.svg' : 'rotten-audience-rotten.svg'}}"> {{ratings.audience_score}}%
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html index dac5bdc04..49875514d 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/cast-carousel/cast-carousel.component.html @@ -5,11 +5,11 @@
- - + + - - + + diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html index d76a6b194..8a8a30987 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.html @@ -7,8 +7,8 @@ {{ 'Requests.Season' | translate }} {{season.seasonNumber}}
- - + +

{{season.overview}}

 diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts index 00b99f5a2..d67073069 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts @@ -65,6 +65,7 @@ export class TvRequestGridComponent { this.notificationService.send( `Request for ${this.tv.title} has been added successfully`); + debugger; this.selection.clear(); if (this.tv.firstSeason) { @@ -81,7 +82,7 @@ export class TvRequestGridComponent { }); }); } - if (this.requestLatestSeason) { + if (this.tv.latestSeason) { this.tv.seasonRequests[this.tv.seasonRequests.length - 1].episodes.forEach(ep => { ep.requested = true; ep.requestStatus = "Common.PendingApproval"; diff --git a/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts b/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts index 999c46ec0..b1467a2f1 100644 --- a/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts +++ b/tests/cypress/tests/details/tv/tvdetails-requests-grid.spec.ts @@ -129,7 +129,7 @@ describe("TV Requests Grid", function () { cy.verifyNotification('You need to select some episodes!'); }); - it("Request single episodes", () => { + it.only("Request single episodes", () => { Page.visit('1399'); Page.requestPanel.seasonTab(2).click(); @@ -142,6 +142,12 @@ describe("TV Requests Grid", function () { Page.requestPanel.getEpisodeStatus(2,1) .should('contain.text', 'Pending Approval') .should('have.class', 'requested') + + Page.requestPanel.getEpisodeStatus(2).each((element) => { + if (element.attr('data-test') !== 'episodeStatus21') { + expect(element.hasClass("requested")).to.be.false; + } + }); });