AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another round of bugfixes (#3707)

Browse source
This commit is contained in:
Joe Milazzo 2025-04-06 13:14:04 -05:00 • committed by GitHub
parent cbb97208b8
commit 93dc6534fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 412 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.html
View file

@ -2,15 +2,15 @@
@if (items.length > virtualizeAfter) {
<div class="example-list list-group-flush">
<virtual-scroller #scroll [items]="items" [bufferAmount]="BufferAmount" [parentScroll]="parentScroll">
<div class="example-box" *ngFor="let item of scroll.viewPortItems; index as i; trackBy: trackByIdentity">
<div class="d-flex list-container">
<ng-container [ngTemplateOutlet]="handle" [ngTemplateOutletContext]="{ $implicit: item, idx: i, isVirtualized: true }"></ng-container>
<ng-container [ngTemplateOutlet]="itemTemplate" [ngTemplateOutletContext]="{ $implicit: item, idx: i }"></ng-container>
<ng-container [ngTemplateOutlet]="removeBtn" [ngTemplateOutletContext]="{$implicit: item, idx: i}"></ng-container>
@for (item of scroll.viewPortItems; track trackByIdentity(i, item); let i = $index) {
<div class="example-box">
<div class="d-flex list-container">
<ng-container [ngTemplateOutlet]="handle" [ngTemplateOutletContext]="{ $implicit: item, idx: i, isVirtualized: true }"></ng-container>
<ng-container [ngTemplateOutlet]="itemTemplate" [ngTemplateOutletContext]="{ $implicit: item, idx: i }"></ng-container>
<ng-container [ngTemplateOutlet]="removeBtn" [ngTemplateOutletContext]="{$implicit: item, idx: i}"></ng-container>
</div>
</div>
</div>
}
</virtual-scroller>
</div>
} @else {

7
UI/Web/src/app/reading-list/_components/draggable-ordered-list/draggable-ordered-list.component.ts
View file

@ -13,7 +13,7 @@ import {
TrackByFunction
} from '@angular/core';
import {VirtualScrollerModule} from '@iharbeck/ngx-virtual-scroller';
import {NgClass, NgFor, NgTemplateOutlet} from '@angular/common';
import {NgClass, NgTemplateOutlet} from '@angular/common';
import {TranslocoDirective} from "@jsverse/transloco";
import {BulkSelectionService} from "../../../cards/bulk-selection.service";
import {FormsModule} from "@angular/forms";
@ -36,13 +36,14 @@ export interface ItemRemoveEvent {
templateUrl: './draggable-ordered-list.component.html',
styleUrls: ['./draggable-ordered-list.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [VirtualScrollerModule, NgFor, NgTemplateOutlet, CdkDropList, CdkDrag,
imports: [VirtualScrollerModule, NgTemplateOutlet, CdkDropList, CdkDrag,
CdkDragHandle, TranslocoDirective, NgClass, FormsModule]
})
export class DraggableOrderedListComponent {
protected readonly bulkSelectionService = inject(BulkSelectionService);
private readonly destroyRef = inject(DestroyRef);
private readonly cdRef = inject(ChangeDetectorRef);
/**
@ -84,7 +85,7 @@ export class DraggableOrderedListComponent {
return Math.min(this.items.length / 20, 20);
}
constructor(private readonly cdRef: ChangeDetectorRef) {
constructor() {
this.bulkSelectionService.selections$.pipe(
takeUntilDestroyed(this.destroyRef)
).subscribe((s) => {

2
UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html
View file

@ -252,6 +252,8 @@
@defer (when activeTabId === TabID.Details; prefetch on idle) {
<app-details-tab [metadata]="castInfo"
[readingTime]="rlInfo"
[suppressEmptyGenres]="true"
[suppressEmptyTags]="true"
[ageRating]="readingList.ageRating"/>
}
</ng-template>