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

Catch errors early in the pipe to not break it

Browse source 
This should hopefully give us more insight these issues when they happen
again
This commit is contained in:
Amelia 2025-04-15 10:23:28 +02:00
parent 467e67ff68
commit a62308c3cf
No known key found for this signature in database
GPG key ID: D6D0ECE365407EAA
4 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts
View file

@ -1,7 +1,7 @@
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core';
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
import {ToastrService} from 'ngx-toastr';
import {debounceTime, distinctUntilChanged, filter, switchMap, tap} from 'rxjs';
import {catchError, debounceTime, distinctUntilChanged, filter, of, switchMap, tap} from 'rxjs';
import {SettingsService} from '../settings.service';
import {ServerSettings} from '../_models/server-settings';
import {translate, TranslocoModule} from "@jsverse/transloco";
@ -46,15 +46,21 @@ export class ManageEmailSettingsComponent implements OnInit {
// Automatically save settings as we edit them
this.settingsForm.valueChanges.pipe(
debounceTime(300),
distinctUntilChanged(),
debounceTime(300),
filter(_ => this.settingsForm.valid),
takeUntilDestroyed(this.destroyRef),
switchMap(_ => {
const data = this.packData();
return this.settingsService.updateServerSettings(data);
return this.settingsService.updateServerSettings(data).pipe(catchError(err => {
console.error(err);
return of(null);
}));
}),
tap(settings => {
if (!settings) {
return;
}
this.serverSettings = settings;
this.cdRef.markForCheck();
})

10
UI/Web/src/app/admin/manage-media-settings/manage-media-settings.component.ts
View file

@ -1,7 +1,7 @@
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core';
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
import {ToastrService} from 'ngx-toastr';
import {debounceTime, distinctUntilChanged, filter, switchMap, take, tap} from 'rxjs';
import {catchError, debounceTime, distinctUntilChanged, filter, of, switchMap, take, tap} from 'rxjs';
import {SettingsService} from '../settings.service';
import {ServerSettings} from '../_models/server-settings';
import {DirectoryPickerComponent, DirectoryPickerResult} from '../_modals/directory-picker/directory-picker.component';
@ -55,9 +55,15 @@ export class ManageMediaSettingsComponent implements OnInit {
takeUntilDestroyed(this.destroyRef),
switchMap(_ => {
const data = this.packData();
return this.settingsService.updateServerSettings(data);
return this.settingsService.updateServerSettings(data).pipe(catchError(err => {
console.error(err);
return of(null);
}));
}),
tap(settings => {
if (!settings) {
return;
}
const encodingChanged = this.serverSettings.encodeMediaAs !== settings.encodeMediaAs;
if (encodingChanged) {

11
UI/Web/src/app/admin/manage-settings/manage-settings.component.ts
View file

@ -10,7 +10,7 @@ import {WikiLink} from "../../_models/wiki";
import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component";
import {SettingSwitchComponent} from "../../settings/_components/setting-switch/setting-switch.component";
import {ConfirmService} from "../../shared/confirm.service";
import {debounceTime, distinctUntilChanged, filter, switchMap, tap} from "rxjs";
import {catchError, debounceTime, distinctUntilChanged, filter, of, switchMap, tap} from "rxjs";
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
import {DefaultValuePipe} from "../../_pipes/default-value.pipe";
import {EnterBlurDirective} from "../../_directives/enter-blur.directive";
@ -85,9 +85,16 @@ export class ManageSettingsComponent implements OnInit {
takeUntilDestroyed(this.destroyRef),
switchMap(_ => {
const data = this.packData();
return this.settingsService.updateServerSettings(data);
return this.settingsService.updateServerSettings(data).pipe(catchError(err => {
console.error(err);
return of(null);
}));
}),
tap(settings => {
if (!settings) {
return
}
this.serverSettings = settings;
this.resetForm();
this.cdRef.markForCheck();

21
UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts
View file

@ -4,7 +4,18 @@ import {ToastrService} from 'ngx-toastr';
import {SettingsService} from '../settings.service';
import {ServerSettings} from '../_models/server-settings';
import {shareReplay} from 'rxjs/operators';
import {debounceTime, defer, distinctUntilChanged, filter, forkJoin, Observable, of, switchMap, tap} from 'rxjs';
import {
catchError,
debounceTime,
defer,
distinctUntilChanged,
filter,
forkJoin,
Observable,
of,
switchMap,
tap
} from 'rxjs';
import {ServerService} from 'src/app/_services/server.service';
import {Job} from 'src/app/_models/job/job';
import {UpdateNotificationModalComponent} from 'src/app/announcements/_components/update-notification/update-notification-modal.component';
@ -173,9 +184,15 @@ export class ManageTasksSettingsComponent implements OnInit {
// }),
switchMap(_ => {
const data = this.packData();
return this.settingsService.updateServerSettings(data);
return this.settingsService.updateServerSettings(data).pipe(catchError(err => {
console.error(err);
return of(null);
}));
}),
tap(settings => {
if (!settings) {
return;
}
this.serverSettings = settings;
this.recurringTasks$ = this.serverService.getRecurringJobs().pipe(shareReplay());