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

UX Overhaul Part 2 (#3112)

Browse source 
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo 2024-08-16 19:37:12 -05:00 • committed by GitHub
parent 0247bc5012
commit 3d8aa2ad24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
192 changed files with 14808 additions and 1874 deletions
Download patch file Download diff file Expand all files Collapse all files

79
UI/Web/src/app/_services/action.service.ts
View file

@ -1,4 +1,4 @@
import { Injectable, OnDestroy } from '@angular/core';
import {inject, Injectable, OnDestroy} from '@angular/core';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { ToastrService } from 'ngx-toastr';
import {Subject, tap} from 'rxjs';
@ -25,6 +25,8 @@ import {CollectionTagService} from "./collection-tag.service";
import {SmartFilter} from "../_models/metadata/v2/smart-filter";
import {FilterService} from "./filter.service";
import {ReadingListService} from "./reading-list.service";
import {ChapterService} from "./chapter.service";
import {VolumeService} from "./volume.service";
export type LibraryActionCallback = (library: Partial<Library>) => void;
export type SeriesActionCallback = (series: Series) => void;
@ -40,22 +42,26 @@ export type BooleanActionCallback = (result: boolean) => void;
@Injectable({
providedIn: 'root'
})
export class ActionService implements OnDestroy {
export class ActionService {
private readonly chapterService = inject(ChapterService);
private readonly volumeService = inject(VolumeService);
private readonly libraryService = inject(LibraryService);
private readonly seriesService = inject(SeriesService);
private readonly readerService = inject(ReaderService);
private readonly toastr = inject(ToastrService);
private readonly modalService = inject(NgbModal);
private readonly confirmService = inject(ConfirmService);
private readonly memberService = inject(MemberService);
private readonly deviceService = inject(DeviceService);
private readonly collectionTagService = inject(CollectionTagService);
private readonly filterService = inject(FilterService);
private readonly readingListService = inject(ReadingListService);
private readonly onDestroy = new Subject<void>();
private readingListModalRef: NgbModalRef | null = null;
private collectionModalRef: NgbModalRef | null = null;
constructor(private libraryService: LibraryService, private seriesService: SeriesService,
private readerService: ReaderService, private toastr: ToastrService, private modalService: NgbModal,
private confirmService: ConfirmService, private memberService: MemberService, private deviceService: DeviceService,
private readonly collectionTagService: CollectionTagService, private filterService: FilterService,
private readonly readingListService: ReadingListService) { }
ngOnDestroy() {
this.onDestroy.next();
this.onDestroy.complete();
}
/**
* Request a file scan for a given Library
@ -290,6 +296,7 @@ export class ActionService implements OnDestroy {
/**
* Mark a chapter as read
* @param libraryId Library Id
* @param seriesId Series Id
* @param chapter Chapter, should have id, pages, volumeId populated
* @param callback Optional callback to perform actions after API completes
@ -306,6 +313,7 @@ export class ActionService implements OnDestroy {
/**
* Mark a chapter as unread
* @param libraryId Library Id
* @param seriesId Series Id
* @param chapter Chapter, should have id, pages, volumeId populated
* @param callback Optional callback to perform actions after API completes
@ -324,7 +332,7 @@ export class ActionService implements OnDestroy {
* Mark all chapters and the volumes as Read. All volumes and chapters must belong to a series
* @param seriesId Series Id
* @param volumes Volumes, should have id, chapters and pagesRead populated
* @param chapters? Chapters, should have id
* @param chapters Optional Chapters, should have id
* @param callback Optional callback to perform actions after API completes
*/
markMultipleAsRead(seriesId: number, volumes: Array<Volume>, chapters?: Array<Chapter>, callback?: VoidActionCallback) {
@ -346,6 +354,7 @@ export class ActionService implements OnDestroy {
* Mark all chapters and the volumes as Unread. All volumes must belong to a series
* @param seriesId Series Id
* @param volumes Volumes, should have id, chapters and pagesRead populated
* @param chapters Optional Chapters, should have id
* @param callback Optional callback to perform actions after API completes
*/
markMultipleAsUnread(seriesId: number, volumes: Array<Volume>, chapters?: Array<Chapter>, callback?: VoidActionCallback) {
@ -690,6 +699,48 @@ export class ActionService implements OnDestroy {
});
}
async deleteChapter(chapterId: number, callback?: BooleanActionCallback) {
if (!await this.confirmService.confirm(translate('toasts.confirm-delete-chapter'))) {
if (callback) {
callback(false);
}
return;
}
this.chapterService.deleteChapter(chapterId).subscribe((res: boolean) => {
if (callback) {
if (res) {
this.toastr.success(translate('toasts.chapter-deleted'));
} else {
this.toastr.error(translate('errors.generic'));
}
callback(res);
}
});
}
async deleteVolume(volumeId: number, callback?: BooleanActionCallback) {
if (!await this.confirmService.confirm(translate('toasts.confirm-delete-volume'))) {
if (callback) {
callback(false);
}
return;
}
this.volumeService.deleteVolume(volumeId).subscribe((res: boolean) => {
if (callback) {
if (res) {
this.toastr.success(translate('toasts.volume-deleted'));
} else {
this.toastr.error(translate('errors.generic'));
}
callback(res);
}
});
}
sendToDevice(chapterIds: Array<number>, device: Device, callback?: VoidActionCallback) {
this.deviceService.sendTo(chapterIds, device.id).subscribe(() => {
this.toastr.success(translate('toasts.file-send-to', {name: device.name}));