Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-08-11 09:13:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

A few bugs from last nightly (#3985)

Browse Source
This commit is contained in:
Fesaa 2025-08-07 20:30:20 +02:00 committed by GitHub
parent 42ef9c5520
commit f2ae1a8040
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/Web/src/app/admin/import-mappings/import-mappings.component.ts
View File

@ -34,12 +34,13 @@ import {
ImportSettings ImportSettings
} from "../../_models/import-field-mappings"; } from "../../_models/import-field-mappings";
import {firstValueFrom, switchMap} from "rxjs"; import {firstValueFrom, switchMap} from "rxjs";
import {tap} from "rxjs/operators"; import {map, tap} from "rxjs/operators";
import {AgeRatingPipe} from "../../_pipes/age-rating.pipe"; import {AgeRatingPipe} from "../../_pipes/age-rating.pipe";
import {NgTemplateOutlet} from "@angular/common"; import {NgTemplateOutlet} from "@angular/common";
import {Router} from "@angular/router"; import {Router} from "@angular/router";
import {LicenseService} from "../../_services/license.service"; import {LicenseService} from "../../_services/license.service";
import {SettingsTabId} from "../../sidenav/preference-nav/preference-nav.component"; import {SettingsTabId} from "../../sidenav/preference-nav/preference-nav.component";
import {toObservable, toSignal} from "@angular/core/rxjs-interop";
enum Step { enum Step {
Import = 0, Import = 0,
@ -112,6 +113,9 @@ export class ImportMappingsComponent implements OnInit {
importedMappings = signal<MetadataMappingsExport | undefined>(undefined); importedMappings = signal<MetadataMappingsExport | undefined>(undefined);
importResult = signal<FieldMappingsImportResult | undefined>(undefined); importResult = signal<FieldMappingsImportResult | undefined>(undefined);
isFileSelected = toSignal(this.uploadForm.get('files')!.valueChanges
.pipe(map((files) => !!files && files.length == 1)), {initialValue: false});
nextButtonLabel = computed(() => { nextButtonLabel = computed(() => {
switch(this.currentStepIndex()) { switch(this.currentStepIndex()) {
case Step.Configure: case Step.Configure:
@ -247,7 +251,7 @@ export class ImportMappingsComponent implements OnInit {
} }
this.importedMappings.set(newImport); this.importedMappings.set(newImport);
this.currentStepIndex.update(x=>x + 1); this.currentStepIndex.update(x => x + 1);
} }
private setupSettingConflicts(res: FieldMappingsImportResult) { private setupSettingConflicts(res: FieldMappingsImportResult) {
@ -294,11 +298,6 @@ export class ImportMappingsComponent implements OnInit {
} }
isFileSelected() {
const files = this.uploadForm.get('files')?.value;
return files && files.length === 1;
}
protected readonly Step = Step; protected readonly Step = Step;
protected readonly WikiLink = WikiLink; protected readonly WikiLink = WikiLink;
protected readonly ImportModes = ImportModes; protected readonly ImportModes = ImportModes;

2
UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts
View File

@ -1571,8 +1571,6 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
} }
setPageNum(pageNum: number) { setPageNum(pageNum: number) {
if (pageNum === this.pageNum) return;
this.pageNum = Math.max(Math.min(pageNum, this.maxPages - 1), 0); this.pageNum = Math.max(Math.min(pageNum, this.maxPages - 1), 0);
this.pageNumSubject.next({pageNum: this.pageNum, maxPages: this.maxPages}); this.pageNumSubject.next({pageNum: this.pageNum, maxPages: this.maxPages});
this.cdRef.markForCheck(); this.cdRef.markForCheck();

4
UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts
View File

@ -42,7 +42,7 @@ import {SettingSwitchComponent} from "../../settings/_components/setting-switch/
import {WritingStylePipe} from "../../_pipes/writing-style.pipe"; import {WritingStylePipe} from "../../_pipes/writing-style.pipe";
import {ColorPickerDirective} from "ngx-color-picker"; import {ColorPickerDirective} from "ngx-color-picker";
import {NgbNav, NgbNavContent, NgbNavItem, NgbNavLinkBase, NgbNavOutlet, NgbTooltip} from "@ng-bootstrap/ng-bootstrap"; import {NgbNav, NgbNavContent, NgbNavItem, NgbNavLinkBase, NgbNavOutlet, NgbTooltip} from "@ng-bootstrap/ng-bootstrap";
import {catchError, filter, finalize, of, switchMap} from "rxjs"; import {catchError, filter, of, switchMap} from "rxjs";
import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
import {LoadingComponent} from "../../shared/loading/loading.component"; import {LoadingComponent} from "../../shared/loading/loading.component";
import {ToastrService} from "ngx-toastr"; import {ToastrService} from "ngx-toastr";
@ -226,7 +226,7 @@ export class ManageReadingProfilesComponent implements OnInit {
takeUntilDestroyed(this.destroyRef), takeUntilDestroyed(this.destroyRef),
tap(_ => this.savingProfile.set(true)), tap(_ => this.savingProfile.set(true)),
switchMap(_ => this.autoSave()), switchMap(_ => this.autoSave()),
finalize(() => this.savingProfile.set(false)) tap(() => this.savingProfile.set(false))
).subscribe(); ).subscribe();
} }