From 5dfcccba7a35e89cab63c152034cafe295d44dd5 Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Tue, 2 Jan 2024 18:53:10 -0600 Subject: [PATCH] New Year Bugs (#2513) --- API/Controllers/AccountController.cs | 7 +- API/Controllers/ReviewController.cs | 8 ++- .../Recommendation/ExternalSeriesDetailDto.cs | 2 + API/DTOs/Recommendation/ExternalSeriesDto.cs | 5 +- API/DTOs/SeriesDetail/UpdateUserReviewDto.cs | 2 - API/DTOs/SeriesDetail/UserReviewDto.cs | 1 + API/Helpers/Builders/RatingBuilder.cs | 1 + API/Services/Plus/ScrobblingService.cs | 6 +- API/Services/Tasks/Scanner/ProcessSeries.cs | 4 +- .../app/_interceptors/error.interceptor.ts | 2 +- .../series-detail/external-series-detail.ts | 4 +- .../_models/series-detail/external-series.ts | 3 + UI/Web/src/app/_services/series.service.ts | 4 +- .../review-card-modal.component.html | 4 +- .../review-card-modal.component.ts | 13 ++-- .../review-card/review-card.component.html | 11 ++- .../review-card/review-card.component.scss | 2 +- .../review-card/review-card.component.ts | 6 +- .../review-series-modal.component.html | 17 +++-- .../review-series-modal.component.ts | 19 +++-- .../series-preview-drawer.component.html | 11 ++- .../series-preview-drawer.component.ts | 7 +- .../bulk-operations.component.html | 2 +- .../cards/card-item/card-item.component.html | 34 +++++---- .../cards/card-item/card-item.component.ts | 5 +- .../external-series-card.component.html | 22 +++--- .../external-series-card.component.ts | 7 +- .../carousel-reel.component.html | 57 ++++++++------- .../series-detail.component.html | 7 +- .../series-detail/series-detail.component.ts | 72 ++++++++++++------- UI/Web/src/assets/langs/en.json | 10 +-- openapi.json | 17 +++-- 32 files changed, 230 insertions(+), 142 deletions(-) diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index dce22c979..5e528c58f 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -318,19 +318,18 @@ public class AccountController : BaseApiController [HttpPost("reset-api-key")] public async Task> ResetApiKey() { - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); - if (user == null) throw new KavitaUnauthenticatedUserException(); - + var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()) ?? throw new KavitaUnauthenticatedUserException(); user.ApiKey = HashUtil.ApiKey(); if (_unitOfWork.HasChanges() && await _unitOfWork.CommitAsync()) { + await _eventHub.SendMessageToAsync(MessageFactory.UserUpdate, + MessageFactory.UserUpdateEvent(user.Id, user.UserName), user.Id); return Ok(user.ApiKey); } await _unitOfWork.RollbackAsync(); return BadRequest(await _localizationService.Translate(User.GetUserId(), "unable-to-reset-key")); - } diff --git a/API/Controllers/ReviewController.cs b/API/Controllers/ReviewController.cs index 5eaedd6b2..63ff20407 100644 --- a/API/Controllers/ReviewController.cs +++ b/API/Controllers/ReviewController.cs @@ -55,8 +55,10 @@ public class ReviewController : BaseApiController public async Task>> GetReviews(int seriesId) { var userId = User.GetUserId(); + var username = User.GetUsername(); var userRatings = (await _unitOfWork.UserRepository.GetUserRatingDtosForSeriesAsync(seriesId, userId)) - .Where(r => !string.IsNullOrEmpty(r.Body) && !string.IsNullOrEmpty(r.Tagline)) + .Where(r => !string.IsNullOrEmpty(r.Body)) + .OrderByDescending(review => review.Username.Equals(username) ? 1 : 0) .ToList(); if (!await _licenseService.HasActiveLicense()) { @@ -139,7 +141,7 @@ public class ReviewController : BaseApiController var rating = ratingBuilder .WithBody(dto.Body) .WithSeriesId(dto.SeriesId) - .WithTagline(dto.Tagline) + .WithTagline(string.Empty) .Build(); if (rating.Id == 0) @@ -152,7 +154,7 @@ public class ReviewController : BaseApiController BackgroundJob.Enqueue(() => - _scrobblingService.ScrobbleReviewUpdate(user.Id, dto.SeriesId, dto.Tagline, dto.Body)); + _scrobblingService.ScrobbleReviewUpdate(user.Id, dto.SeriesId, string.Empty, dto.Body)); return Ok(_mapper.Map(rating)); } } diff --git a/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs b/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs index a1341b358..9aa852fd7 100644 --- a/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs +++ b/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using API.DTOs.Scrobbling; +using API.Services.Plus; namespace API.DTOs.Recommendation; #nullable enable @@ -19,4 +20,5 @@ public class ExternalSeriesDetailDto public string? Summary { get; set; } public int? VolumeCount { get; set; } public int? ChapterCount { get; set; } + public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList; } diff --git a/API/DTOs/Recommendation/ExternalSeriesDto.cs b/API/DTOs/Recommendation/ExternalSeriesDto.cs index f3ceb1b27..55d2d320c 100644 --- a/API/DTOs/Recommendation/ExternalSeriesDto.cs +++ b/API/DTOs/Recommendation/ExternalSeriesDto.cs @@ -1,4 +1,6 @@ -namespace API.DTOs.Recommendation; +using API.Services.Plus; + +namespace API.DTOs.Recommendation; #nullable enable public class ExternalSeriesDto @@ -9,4 +11,5 @@ public class ExternalSeriesDto public string? Summary { get; set; } public int? AniListId { get; set; } public long? MalId { get; set; } + public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList; } diff --git a/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs b/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs index cb4039368..b25b01672 100644 --- a/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs +++ b/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs @@ -6,7 +6,5 @@ namespace API.DTOs.SeriesDetail; public class UpdateUserReviewDto { public int SeriesId { get; set; } - [MaxLength(120)] - public string? Tagline { get; set; } public string Body { get; set; } } diff --git a/API/DTOs/SeriesDetail/UserReviewDto.cs b/API/DTOs/SeriesDetail/UserReviewDto.cs index 6692c6bd5..c8b2f88c5 100644 --- a/API/DTOs/SeriesDetail/UserReviewDto.cs +++ b/API/DTOs/SeriesDetail/UserReviewDto.cs @@ -12,6 +12,7 @@ public class UserReviewDto /// /// A tagline for the review /// + /// This is not possible to set as a local user public string? Tagline { get; set; } /// diff --git a/API/Helpers/Builders/RatingBuilder.cs b/API/Helpers/Builders/RatingBuilder.cs index 4656c1fa1..54af47ae8 100644 --- a/API/Helpers/Builders/RatingBuilder.cs +++ b/API/Helpers/Builders/RatingBuilder.cs @@ -28,6 +28,7 @@ public class RatingBuilder : IEntityBuilder public RatingBuilder WithTagline(string? tagline) { + if (string.IsNullOrEmpty(tagline)) return this; _rating.Tagline = tagline; return this; } diff --git a/API/Services/Plus/ScrobblingService.cs b/API/Services/Plus/ScrobblingService.cs index d33ccfb19..7c117debc 100644 --- a/API/Services/Plus/ScrobblingService.cs +++ b/API/Services/Plus/ScrobblingService.cs @@ -42,7 +42,7 @@ public interface IScrobblingService Task CheckExternalAccessTokens(); Task HasTokenExpired(int userId, ScrobbleProvider provider); Task ScrobbleRatingUpdate(int userId, int seriesId, float rating); - Task ScrobbleReviewUpdate(int userId, int seriesId, string reviewTitle, string reviewBody); + Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody); Task ScrobbleReadingUpdate(int userId, int seriesId); Task ScrobbleWantToReadUpdate(int userId, int seriesId, bool onWantToRead); @@ -185,8 +185,10 @@ public class ScrobblingService : IScrobblingService } ?? string.Empty; } - public async Task ScrobbleReviewUpdate(int userId, int seriesId, string reviewTitle, string reviewBody) + public async Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody) { + // Currently disabled until at least hardcover is implemented + return; if (!await _licenseService.HasActiveLicense()) return; var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library); diff --git a/API/Services/Tasks/Scanner/ProcessSeries.cs b/API/Services/Tasks/Scanner/ProcessSeries.cs index cb9ae2916..1cf179139 100644 --- a/API/Services/Tasks/Scanner/ProcessSeries.cs +++ b/API/Services/Tasks/Scanner/ProcessSeries.cs @@ -295,9 +295,9 @@ public class ProcessSeries : IProcessSeries if (series.Format == MangaFormat.Epub || series.Format == MangaFormat.Pdf && chapters.Count == 1) { series.Metadata.MaxCount = 1; - } else if (series.Metadata.TotalCount == 1 && chapters.Count == 1 && chapters[0].IsSpecial) + } else if (series.Metadata.TotalCount <= 1 && chapters.Count == 1 && chapters[0].IsSpecial) { - // If a series has a TotalCount of 1 and there is only a Special, mark it as Complete + // If a series has a TotalCount of 1 (or no total count) and there is only a Special, mark it as Complete series.Metadata.MaxCount = series.Metadata.TotalCount; } else if ((maxChapter == 0 || maxChapter > series.Metadata.TotalCount) && maxVolume <= series.Metadata.TotalCount) { diff --git a/UI/Web/src/app/_interceptors/error.interceptor.ts b/UI/Web/src/app/_interceptors/error.interceptor.ts index 77b27acf0..8f9c31fed 100644 --- a/UI/Web/src/app/_interceptors/error.interceptor.ts +++ b/UI/Web/src/app/_interceptors/error.interceptor.ts @@ -41,7 +41,7 @@ export class ErrorInterceptor implements HttpInterceptor { break; default: // Don't throw multiple Something unexpected went wrong - let genericError = translate('errors.generic'); + const genericError = translate('errors.generic'); if (this.toastr.previousToastMessage !== 'Something unexpected went wrong.' && this.toastr.previousToastMessage !== genericError) { this.toast(genericError); } diff --git a/UI/Web/src/app/_models/series-detail/external-series-detail.ts b/UI/Web/src/app/_models/series-detail/external-series-detail.ts index 1bd008292..85d89c760 100644 --- a/UI/Web/src/app/_models/series-detail/external-series-detail.ts +++ b/UI/Web/src/app/_models/series-detail/external-series-detail.ts @@ -1,3 +1,5 @@ +import {ScrobbleProvider} from "../../_services/scrobbling.service"; + export enum PlusMediaFormat { Manga = 1, Comic = 2, @@ -37,5 +39,5 @@ export interface ExternalSeriesDetail { chapterCount?: number; staff: Array; tags: Array; - + provider: ScrobbleProvider; } diff --git a/UI/Web/src/app/_models/series-detail/external-series.ts b/UI/Web/src/app/_models/series-detail/external-series.ts index 1d0a46bc5..8bf95331f 100644 --- a/UI/Web/src/app/_models/series-detail/external-series.ts +++ b/UI/Web/src/app/_models/series-detail/external-series.ts @@ -1,3 +1,5 @@ +import {ScrobbleProvider} from "../../_services/scrobbling.service"; + export interface ExternalSeries { name: string; coverUrl: string; @@ -5,4 +7,5 @@ export interface ExternalSeries { summary: string; aniListId?: number; malId?: number; + provider: ScrobbleProvider; } diff --git a/UI/Web/src/app/_services/series.service.ts b/UI/Web/src/app/_services/series.service.ts index 6a92a491e..84cda86a9 100644 --- a/UI/Web/src/app/_services/series.service.ts +++ b/UI/Web/src/app/_services/series.service.ts @@ -213,9 +213,9 @@ export class SeriesService { return this.httpClient.get>(this.baseUrl + 'review?seriesId=' + seriesId); } - updateReview(seriesId: number, tagline: string, body: string) { + updateReview(seriesId: number, body: string) { return this.httpClient.post(this.baseUrl + 'review', { - seriesId, tagline, body + seriesId, body }); } diff --git a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.html b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.html index 177e63d11..c76ddacef 100644 --- a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.html +++ b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.html @@ -1,7 +1,9 @@
- +
diff --git a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts index 24eb32d3f..4926ac5e8 100644 --- a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts +++ b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts @@ -1,24 +1,26 @@ import { AfterViewInit, ChangeDetectionStrategy, - Component, + Component, inject, Inject, Input, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; -import {CommonModule, DOCUMENT} from '@angular/common'; +import {CommonModule, DOCUMENT, NgOptimizedImage} from '@angular/common'; import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; import {ReactiveFormsModule} from "@angular/forms"; import {UserReview} from "../review-card/user-review"; import {SpoilerComponent} from "../spoiler/spoiler.component"; import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {TranslocoDirective} from "@ngneat/transloco"; +import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; +import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; @Component({ selector: 'app-review-card-modal', standalone: true, - imports: [CommonModule, ReactiveFormsModule, SpoilerComponent, SafeHtmlPipe, TranslocoDirective], + imports: [CommonModule, ReactiveFormsModule, SpoilerComponent, SafeHtmlPipe, TranslocoDirective, DefaultValuePipe, NgOptimizedImage, ProviderImagePipe], templateUrl: './review-card-modal.component.html', styleUrls: ['./review-card-modal.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -26,12 +28,13 @@ import {TranslocoDirective} from "@ngneat/transloco"; }) export class ReviewCardModalComponent implements AfterViewInit { + private modal = inject(NgbActiveModal); + @Input({required: true}) review!: UserReview; @ViewChild('container', { read: ViewContainerRef }) container!: ViewContainerRef; - constructor(private modal: NgbActiveModal, @Inject(DOCUMENT) private document: Document) { - } + constructor(@Inject(DOCUMENT) private document: Document) {} close() { this.modal.close(); diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.html b/UI/Web/src/app/_single-module/review-card/review-card.component.html index 3f8e562a9..e1235070f 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.html +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.html @@ -10,11 +10,8 @@
-
- {{review.tagline.substring(0, 29)}}{{review.tagline.length > 29 ? '…' : ''}} - - {{review.isExternal ? t('external-review') : t('local-review')}} - +
+ {{review.isExternal ? t('external-review') : t('local-review')}}

@@ -23,9 +20,11 @@

-
+
+ + {{review.username}} diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.scss b/UI/Web/src/app/_single-module/review-card/review-card.component.scss index e1caefb65..511e10a96 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.scss +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.scss @@ -39,7 +39,7 @@ .card-footer { font-size: 13px; display: flex; - max-width: 305px; + max-width: 319px; justify-content: space-between; margin: 0 auto; } diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.ts b/UI/Web/src/app/_single-module/review-card/review-card.component.ts index 1d3816326..fe2b3b22f 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.ts +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.ts @@ -10,6 +10,7 @@ import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; import {ImageComponent} from "../../shared/image/image.component"; import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; import {TranslocoDirective} from "@ngneat/transloco"; +import {ScrobbleProvider} from "../../_services/scrobbling.service"; @Component({ selector: 'app-review-card', @@ -20,9 +21,11 @@ import {TranslocoDirective} from "@ngneat/transloco"; changeDetection: ChangeDetectionStrategy.OnPush }) export class ReviewCardComponent implements OnInit { + private readonly accountService = inject(AccountService); + protected readonly ScrobbleProvider = ScrobbleProvider; @Input({required: true}) review!: UserReview; - private readonly accountService = inject(AccountService); + isMyReview: boolean = false; constructor(private readonly modalService: NgbModal, private readonly cdRef: ChangeDetectorRef) {} @@ -46,5 +49,4 @@ export class ReviewCardComponent implements OnInit { const ref = this.modalService.open(component, {size: 'lg', fullscreen: 'md'}); ref.componentInstance.review = this.review; } - } diff --git a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html b/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html index 00c60cc80..9c4053135 100644 --- a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html +++ b/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html @@ -8,14 +8,19 @@
-
- - -
-
- + +
+ @if (reviewGroup.get('reviewBody')?.errors?.required) { +
{{t('required')}}
+ } + @if (reviewGroup.get('reviewBody')?.errors?.minlength) { +
{{t('min-length', {count: minLength})}}
+ } +
diff --git a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.ts b/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.ts index bafbe9ce8..5aa539421 100644 --- a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.ts +++ b/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; import {NgbActiveModal, NgbRating} from '@ng-bootstrap/ng-bootstrap'; import { SeriesService } from 'src/app/_services/series.service'; @@ -9,22 +9,24 @@ import {TranslocoDirective} from "@ngneat/transloco"; @Component({ selector: 'app-review-series-modal', standalone: true, - imports: [CommonModule, NgbRating, ReactiveFormsModule, TranslocoDirective], + imports: [CommonModule, NgbRating, ReactiveFormsModule, TranslocoDirective], templateUrl: './review-series-modal.component.html', styleUrls: ['./review-series-modal.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class ReviewSeriesModalComponent implements OnInit { + protected readonly modal = inject(NgbActiveModal); + private readonly seriesService = inject(SeriesService); + private readonly cdRef = inject(ChangeDetectorRef); + protected readonly minLength = 20; + @Input({required: true}) review!: UserReview; reviewGroup!: FormGroup; - constructor(public modal: NgbActiveModal, private seriesService: SeriesService, private readonly cdRef: ChangeDetectorRef) {} - ngOnInit(): void { this.reviewGroup = new FormGroup({ - tagline: new FormControl(this.review.tagline || '', [Validators.min(20), Validators.max(120)]), - reviewBody: new FormControl(this.review.body, [Validators.min(20)]), + reviewBody: new FormControl(this.review.body, [Validators.required, Validators.minLength(this.minLength)]), }); this.cdRef.markForCheck(); } @@ -35,7 +37,10 @@ export class ReviewSeriesModalComponent implements OnInit { save() { const model = this.reviewGroup.value; - this.seriesService.updateReview(this.review.seriesId, model.tagline, model.reviewBody).subscribe(() => { + if (model.reviewBody.length < this.minLength) { + return; + } + this.seriesService.updateReview(this.review.seriesId, model.reviewBody).subscribe(() => { this.modal.close({success: true}); }); } diff --git a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html index 618eba9fc..88b2a4747 100644 --- a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html +++ b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html @@ -2,6 +2,7 @@
{{name}} +
@@ -17,6 +18,14 @@
{{t('series-preview-drawer.vols-and-chapters', {volCount: externalSeries.volumeCount, chpCount: externalSeries.chapterCount})}}
+ + @if(isExternalSeries && externalSeries) { +
+ {{t('series-preview-drawer.provided-by-label')}} + +
+ } +
@@ -122,7 +131,7 @@ - + {{t('series-preview-drawer.view-series')}}
diff --git a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.ts b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.ts index b28fdf320..f2eeefbf5 100644 --- a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.ts +++ b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; -import {CommonModule} from '@angular/common'; +import {CommonModule, NgOptimizedImage} from '@angular/common'; import {TranslocoDirective} from "@ngneat/transloco"; import {NgbActiveOffcanvas, NgbTooltip} from "@ng-bootstrap/ng-bootstrap"; import {ExternalSeriesDetail, SeriesStaff} from "../../_models/series-detail/external-series-detail"; @@ -16,11 +16,13 @@ import {PublicationStatusPipe} from "../../_pipes/publication-status.pipe"; import {SeriesMetadata} from "../../_models/metadata/series-metadata"; import {ReadMoreComponent} from "../../shared/read-more/read-more.component"; import {ActionService} from "../../_services/action.service"; +import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; +import {ScrobbleProvider} from "../../_services/scrobbling.service"; @Component({ selector: 'app-series-preview-drawer', standalone: true, - imports: [CommonModule, TranslocoDirective, ImageComponent, LoadingComponent, SafeHtmlPipe, A11yClickDirective, MetadataDetailComponent, PersonBadgeComponent, TagBadgeComponent, PublicationStatusPipe, ReadMoreComponent, NgbTooltip], + imports: [CommonModule, TranslocoDirective, ImageComponent, LoadingComponent, SafeHtmlPipe, A11yClickDirective, MetadataDetailComponent, PersonBadgeComponent, TagBadgeComponent, PublicationStatusPipe, ReadMoreComponent, NgbTooltip, NgOptimizedImage, ProviderImagePipe], templateUrl: './series-preview-drawer.component.html', styleUrls: ['./series-preview-drawer.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush @@ -59,7 +61,6 @@ export class SeriesPreviewDrawerComponent implements OnInit { if (this.isExternalSeries) { this.seriesService.getExternalSeriesDetails(this.aniListId, this.malId).subscribe(externalSeries => { this.externalSeries = externalSeries; - this.isLoading = false; if (this.externalSeries.siteUrl) { this.url = this.externalSeries.siteUrl; diff --git a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.html b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.html index ef9264f6f..6d0172920 100644 --- a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.html +++ b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.html @@ -1,6 +1,6 @@ -
+
diff --git a/UI/Web/src/app/cards/card-item/card-item.component.html b/UI/Web/src/app/cards/card-item/card-item.component.html index 1dee096b6..46eef70c2 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.html +++ b/UI/Web/src/app/cards/card-item/card-item.component.html @@ -1,30 +1,35 @@
- + @if (total > 0 || suppressArchiveWarning) { - - + } @else if (total === 0 && !suppressArchiveWarning) { - + }
-

- -

+ @if (read > 0 && read < total && total > 0 && read !== total) { +

+ +

+ } +
-
- {{t('cannot-read')}} -
- + @if(total === 0 && !suppressArchiveWarning) { +
+ {{t('cannot-read')}} +
+ } + + @if (read === 0 && total > 0) {
- + }
@@ -34,14 +39,13 @@ {{count}}
- + @if (overlayInformation | safeHtml; as info) {
- - + }
diff --git a/UI/Web/src/app/cards/card-item/card-item.component.ts b/UI/Web/src/app/cards/card-item/card-item.component.ts index 81e5356e2..d9f6ddbb3 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.ts +++ b/UI/Web/src/app/cards/card-item/card-item.component.ts @@ -38,7 +38,7 @@ import {MangaFormatPipe} from "../../_pipes/manga-format.pipe"; import {MangaFormatIconPipe} from "../../_pipes/manga-format-icon.pipe"; import {SentenceCasePipe} from "../../_pipes/sentence-case.pipe"; import {CommonModule} from "@angular/common"; -import {RouterLink} from "@angular/router"; +import {RouterLink, RouterLinkActive} from "@angular/router"; import {TranslocoModule} from "@ngneat/transloco"; import {CardActionablesComponent} from "../../_single-module/card-actionables/card-actionables.component"; import {NextExpectedChapter} from "../../_models/series-detail/next-expected-chapter"; @@ -61,7 +61,8 @@ import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; SentenceCasePipe, RouterLink, TranslocoModule, - SafeHtmlPipe + SafeHtmlPipe, + RouterLinkActive ], templateUrl: './card-item.component.html', styleUrls: ['./card-item.component.scss'], diff --git a/UI/Web/src/app/cards/external-series-card/external-series-card.component.html b/UI/Web/src/app/cards/external-series-card/external-series-card.component.html index feb6caf72..7878da1d9 100644 --- a/UI/Web/src/app/cards/external-series-card/external-series-card.component.html +++ b/UI/Web/src/app/cards/external-series-card/external-series-card.component.html @@ -14,19 +14,21 @@
+
-
-
- - {{data.name}} - - - - + @if (data.name.length > 0) { +
+
+ + + {{data.name}} + +
+ {{t('open-external')}}
- {{t('open-external')}} -
+ } +
diff --git a/UI/Web/src/app/cards/external-series-card/external-series-card.component.ts b/UI/Web/src/app/cards/external-series-card/external-series-card.component.ts index c531d1550..d979d8528 100644 --- a/UI/Web/src/app/cards/external-series-card/external-series-card.component.ts +++ b/UI/Web/src/app/cards/external-series-card/external-series-card.component.ts @@ -5,7 +5,7 @@ import { Input, ViewChild } from '@angular/core'; -import {CommonModule} from '@angular/common'; +import {CommonModule, NgOptimizedImage} from '@angular/common'; import {ExternalSeries} from "../../_models/series-detail/external-series"; import {RouterLinkActive} from "@angular/router"; import {ImageComponent} from "../../shared/image/image.component"; @@ -13,11 +13,13 @@ import {NgbOffcanvas, NgbProgressbar, NgbTooltip} from "@ng-bootstrap/ng-bootstr import {ReactiveFormsModule} from "@angular/forms"; import {TranslocoDirective} from "@ngneat/transloco"; import {SeriesPreviewDrawerComponent} from "../../_single-module/series-preview-drawer/series-preview-drawer.component"; +import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; +import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; @Component({ selector: 'app-external-series-card', standalone: true, - imports: [CommonModule, ImageComponent, NgbProgressbar, NgbTooltip, ReactiveFormsModule, RouterLinkActive, TranslocoDirective], + imports: [CommonModule, ImageComponent, NgbProgressbar, NgbTooltip, ReactiveFormsModule, RouterLinkActive, TranslocoDirective, NgOptimizedImage, ProviderImagePipe, SafeHtmlPipe], templateUrl: './external-series-card.component.html', styleUrls: ['./external-series-card.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush @@ -30,6 +32,7 @@ export class ExternalSeriesCardComponent { @Input() previewOnClick: boolean = false; @ViewChild('link', {static: false}) link!: ElementRef; + private readonly offcanvasService = inject(NgbOffcanvas); handleClick() { diff --git a/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html b/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html index 15151ebfc..c2104bf98 100644 --- a/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html +++ b/UI/Web/src/app/carousel/_components/carousel-reel/carousel-reel.component.html @@ -1,30 +1,37 @@ -
-
-

- {{title}} - -

-
- - + + @if(alwaysShow || items && items.length > 0) { +
+
+

+ {{title}} + +

+
+ + +
+ @if (items.length > 0) { +
+ + + + + + + + + + +
+ }
-
- - - - - - - - - - -
-
+ } + + diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html index 7d1976340..1e342e4f3 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html @@ -43,6 +43,9 @@
+ + +
@@ -120,7 +123,7 @@
-
+
@@ -132,7 +135,7 @@
- +
  • {{t('storyline-tab')}} diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts index dcde15d0a..a5a92db09 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts @@ -1,4 +1,14 @@ -import {DecimalPipe, DOCUMENT, NgFor, NgIf, NgStyle, NgSwitch, NgSwitchCase, NgTemplateOutlet} from '@angular/common'; +import { + DecimalPipe, + DOCUMENT, + NgClass, + NgFor, + NgIf, NgOptimizedImage, + NgStyle, + NgSwitch, + NgSwitchCase, + NgTemplateOutlet +} from '@angular/common'; import { AfterContentChecked, ChangeDetectionStrategy, @@ -94,6 +104,7 @@ import { import {PublicationStatus} from "../../../_models/metadata/publication-status"; import {NextExpectedChapter} from "../../../_models/series-detail/next-expected-chapter"; import {NextExpectedCardComponent} from "../../../cards/next-expected-card/next-expected-card.component"; +import {ProviderImagePipe} from "../../../_pipes/provider-image.pipe"; interface RelatedSeriesPair { series: Series; @@ -121,13 +132,43 @@ interface StoryLineItem { styleUrls: ['./series-detail.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [NgIf, SideNavCompanionBarComponent, CardActionablesComponent, ReactiveFormsModule, NgStyle, TagBadgeComponent, ImageComponent, NgbTooltip, NgbProgressbar, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, SeriesMetadataDetailComponent, CarouselReelComponent, ReviewCardComponent, BulkOperationsComponent, NgbNav, NgbNavItem, NgbNavLink, NgbNavContent, VirtualScrollerModule, NgFor, CardItemComponent, ListItemComponent, EntityTitleComponent, SeriesCardComponent, ExternalSeriesCardComponent, ExternalListItemComponent, NgbNavOutlet, LoadingComponent, DecimalPipe, TranslocoDirective, NgTemplateOutlet, NgSwitch, NgSwitchCase, NextExpectedCardComponent] + imports: [NgIf, SideNavCompanionBarComponent, CardActionablesComponent, ReactiveFormsModule, NgStyle, TagBadgeComponent, ImageComponent, NgbTooltip, NgbProgressbar, NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, SeriesMetadataDetailComponent, CarouselReelComponent, ReviewCardComponent, BulkOperationsComponent, NgbNav, NgbNavItem, NgbNavLink, NgbNavContent, VirtualScrollerModule, NgFor, CardItemComponent, ListItemComponent, EntityTitleComponent, SeriesCardComponent, ExternalSeriesCardComponent, ExternalListItemComponent, NgbNavOutlet, LoadingComponent, DecimalPipe, TranslocoDirective, NgTemplateOutlet, NgSwitch, NgSwitchCase, NextExpectedCardComponent, NgClass, NgOptimizedImage, ProviderImagePipe] }) export class SeriesDetailComponent implements OnInit, AfterContentChecked { + private readonly destroyRef = inject(DestroyRef); + private readonly route = inject(ActivatedRoute); + private readonly seriesService = inject(SeriesService); + private readonly router = inject(Router); + private readonly modalService = inject(NgbModal); + private readonly toastr = inject(ToastrService); + private readonly accountService = inject(AccountService); + private readonly actionFactoryService = inject(ActionFactoryService); + private readonly libraryService = inject(LibraryService); + private readonly titleService = inject(Title); + private readonly downloadService = inject(DownloadService); + private readonly actionService = inject(ActionService); + private readonly messageHub = inject(MessageHubService); + private readonly readingListService = inject(ReadingListService); + private readonly offcanvasService = inject(NgbOffcanvas); + private readonly cdRef = inject(ChangeDetectorRef); + private readonly scrollService = inject(ScrollService); + private readonly deviceService = inject(DeviceService); + private readonly translocoService = inject(TranslocoService); + + protected readonly bulkSelectionService = inject(BulkSelectionService); + protected readonly utilityService = inject(UtilityService); + protected readonly imageService = inject(ImageService); + protected readonly navService = inject(NavService); + protected readonly readerService = inject(ReaderService); + protected readonly LibraryType = LibraryType; + protected readonly PageLayoutMode = PageLayoutMode; + protected readonly TabID = TabID; + protected readonly TagBadgeCursor = TagBadgeCursor; + @ViewChild('scrollingBlock') scrollingBlock: ElementRef | undefined; @ViewChild('companionBar') companionBar: ElementRef | undefined; - private readonly destroyRef = inject(DestroyRef); + /** * Series Id. Set at load before UI renders @@ -269,14 +310,6 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { } } - get TagBadgeCursor() { return TagBadgeCursor; } - - get TabID() { return TabID; } - - get PageLayoutMode() { return PageLayoutMode; } - - get LibraryType() { return LibraryType; } - get ScrollingBlockHeight() { if (this.scrollingBlock === undefined) return 'calc(var(--vh)*100)'; const navbar = this.document.querySelector('.navbar') as HTMLElement; @@ -285,6 +318,8 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { const companionHeight = this.companionBar!.nativeElement.offsetHeight; const navbarHeight = navbar.offsetHeight; const totalHeight = companionHeight + navbarHeight + 21; //21px to account for padding + console.log('compainionHeight: ', companionHeight) + console.log('navbarHeight: ', navbarHeight) return 'calc(var(--vh)*100 - ' + totalHeight + 'px)'; } @@ -308,20 +343,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { return this.currentlyReadingChapter.title; } - constructor(private route: ActivatedRoute, private seriesService: SeriesService, - private router: Router, public bulkSelectionService: BulkSelectionService, - private modalService: NgbModal, public readerService: ReaderService, - public utilityService: UtilityService, private toastr: ToastrService, - private accountService: AccountService, public imageService: ImageService, - private actionFactoryService: ActionFactoryService, private libraryService: LibraryService, - private titleService: Title, - private downloadService: DownloadService, private actionService: ActionService, - private messageHub: MessageHubService, private readingListService: ReadingListService, - public navService: NavService, - private offcanvasService: NgbOffcanvas, @Inject(DOCUMENT) private document: Document, - private cdRef: ChangeDetectorRef, private scrollService: ScrollService, - private deviceService: DeviceService, private translocoService: TranslocoService - ) { + constructor(@Inject(DOCUMENT) private document: Document) { this.router.routeReuseStrategy.shouldReuseRoute = () => false; this.accountService.currentUser$.pipe(take(1)).subscribe(user => { if (user) { diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 0db260715..cb507bcd9 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -62,10 +62,11 @@ "review-series-modal": { "title": "Edit Review", - "tagline-label": "Tagline", "review-label": "Review", "close": "{{common.close}}", - "save": "{{common.save}}" + "save": "{{common.save}}", + "min-length": "Review must be at least {{count}} characters", + "required": "{{validation.required-field}}" }, "review-card-modal": { @@ -78,7 +79,7 @@ "review-card": { "your-review": "This is your review", "external-review": "External Review", - "local-review": "Review", + "local-review": "Local Review", "rating-percentage": "Rating {{r}}%" }, @@ -1716,7 +1717,8 @@ "view-series": "View Series", "vols-and-chapters": "{{volCount}} Volumes / {{chpCount}} Chapters", "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}", - "add-to-want-to-read": "{{actionable.add-to-want-to-read}}" + "add-to-want-to-read": "{{actionable.add-to-want-to-read}}", + "provided-by-label": "Provided by" }, "next-expected-card": { diff --git a/openapi.json b/openapi.json index 9ba598f7d..629f4ea01 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.7.11.4" + "version": "0.7.11.5" }, "servers": [ { @@ -14868,6 +14868,16 @@ "type": "integer", "format": "int64", "nullable": true + }, + "provider": { + "enum": [ + 0, + 1, + 2 + ], + "type": "integer", + "description": "Misleading name but is the source of data (like a review coming from AniList)", + "format": "int32" } }, "additionalProperties": false @@ -19547,11 +19557,6 @@ "type": "integer", "format": "int32" }, - "tagline": { - "maxLength": 120, - "type": "string", - "nullable": true - }, "body": { "type": "string", "nullable": true