mirror of
https://github.com/Kareadita/Kavita.git
synced 2026-03-23 10:10:30 -04:00
* Implemented the first version of dynamic filtering which is all Extension based. * Implemented basic generic property filter for expanded metadata filtering. * Fixed up the code to allow for nested properties and fixed up the Contains to work only for IList's * Started refactoring for the new approach * More progress, need to rethink a few filters like read progress to be % based and people needs to be more explicit. * Refactored most of the existing filtering operations into dedicate extensions for the appropriate comparisons. People still need to be reworked to be more dynamic. * Fixed a bug with continue point where it fails on chapters or volumes tagged with a range * Wired up a basic api path to start building groups. No and/or support yet. * Started on the UI * Made a bit of progress on the UI as I'm putting the pieces together about how to design it. * Refactored names to make it more consistent. New thinking is we will have one row that will take a filter statement and manipulate it. It will emit said statement and a builder will turn into the higher level statement. * Started working on updating code to use new inject() method. * Fixed the code to switch the comparisons. * Added dynamic input structure in and moved add/remove to the builder. * Fixed an enum bug * Hooked in basic dropdown support that is dynamic to the field. Only language is missing as that needs a DTO change (but don't want to break API) * Fixed a bug where dropdown options wouldn't re-populate when switching fields that are both dropdowns * Started adding metadata builder * Fixed when typing on filter row the focus resetting * Refactored to add an additional component which handles the compounding of filter rows. * Started hooking up v2 dto in the UI to send to the backend. * Started working on building group UI for and/or support. * Lots of backend code fixes to ensure OR and AND statements combine correctly. * More trying to figure out how to write the UI code * Started debugging to remember what I was last doing. * Lots of progress towards building out the UI recursively * I got the dto to build and propagate up the chain * Started hooking up to the actual api to fetch the data. * Basic wire up to the backend is working. * HasName is now complete * Refactored SortOptions code into an extension and streamlined LimitTo to the correct place. * Fixed a bug where Library Filters from the Group weren't actually being taken into account. * Refactored a lot of code so builder will now export the full dto. * Cleaned up the data flow from metadata filter to library detail * Got the dropdown to load preset values on first load, but now it triggers twice. * Changed so when you add a new filter, it does it at top and fixed remove * Fixed the remove button being on the wrong row * Cleaned up the arrays to make it easier to manage * Cleaned up some of the backend to ensure it doesn't throw an incorrect exception * I'm starting to tread water, taking a break * Fixed a merge issue * Cleaned up Docker checks. * Default IpAddresses to empty string. * Refactored IsDocker to be completely static * Figured out the issue with the dropdown not working. * Almost got it, but the event isn't being called. * I think i might try something else. This doesn't seem to be working. * On the new implementation, implemented remove group. * Use enums to reduce copy/paste * the new system is working pretty well, ill go with it and move on. Can alwasy refactor. * Code is totally broken, but working the cache resume code with some hiccups. * I need to take a break * Stashing my broken code. I have an idea on how to serialize to the URL, but I need to rearchitect a lot. * Reverted last commit * remove domain * Fixed up some hardcoded caching. I'm giving up on this implementation and going to a simpler version * Refactored the backend to just allow flat filtering. * Started refactoring the components to make it flat filtering only. * Finished refactoring so that the base preset case will render. * Implemented basic query functionality on desktop. Clear needs some work and url code. * Some cleanup * Working on filtering url encode/decode * Interacting with filters now saves to url and can be reloaded from the url. Named filters is not hooked up. * Fixed a double load on the library detail page. * Moved the library filtering code out of the FilterBuilder as it needs to be handled differently. * Fixed up how we handle library statements in the filter. * Fixed up how links that perform a filter work. * Refactored a bunch of linking to a search page. * LimitTo works, my css however does not. * Switched some code to use localized strings. * Cleaned up some css * Hooked up Languages and put some additional code in so that Languages will return invalid Language codes back. * Removed a duplicate language signature. * Hooked up ability to preload collection tag. * Want To Read is converted * Converted lots of code to new filtering system. Need to do Bookmarks. * Fixed a potential bug with default filter creation. * Hooked up the ability to disable certain filter fields from appearing. * Added mobile drawer code and a hook for Robbie to take a look for some css. * Converted the APIs for dashboard along with other safety fixes to ensure bad data doesn't break any of the filtering apis * Added the backend code to handle summary query * Converted Want to Read api properly now. * Fixed the HasReadingProgress query * Hooked back the Reading Progress for legacy APIs * Fixed some bad localization strings * Wrote the filtering code for all-bookmarks. * OPDS is now using the new filter * Fixed OPDS reading lists and covers not sending their images. * Fixed up the OPDS feed and fixed a bug where libraries also weren't sending their images over OPDS * All but dropdown options have been validated and tested. * Fixed up some default cases for setting up the filter. * Sorted filter fields and re-keyed to be better suited based on user's needs. Fixed a bug where OPDS Series (from library view) wasn't showing the summary. Moved the (Format) from the title to the description to make the UX much better for OPDS. MOved * don't send empty summaries in the new summary formatting * Fixed up some default cases for setting up the filter. * Fixed the reset button * Fixed infinite scroller not having correct scope key * Added localization to the new components and removed old debug code * Styling fixes * Fixed deep linking across the app. Made it so you can click Characters from Reading list and open a filtered search. * A bit of styling for mobile * Don't show language if it's not properly set --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
229 lines
8.9 KiB
TypeScript
229 lines
8.9 KiB
TypeScript
import {
|
|
ChangeDetectionStrategy,
|
|
ChangeDetectorRef,
|
|
Component,
|
|
EventEmitter,
|
|
HostListener,
|
|
inject,
|
|
OnInit
|
|
} from '@angular/core';
|
|
import { ActivatedRoute, Router } from '@angular/router';
|
|
import { ToastrService } from 'ngx-toastr';
|
|
import { take } from 'rxjs';
|
|
import { BulkSelectionService } from 'src/app/cards/bulk-selection.service';
|
|
import { FilterSettings } from 'src/app/metadata-filter/filter-settings';
|
|
import { ConfirmService } from 'src/app/shared/confirm.service';
|
|
import { DownloadService } from 'src/app/shared/_services/download.service';
|
|
import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service';
|
|
import { KEY_CODES } from 'src/app/shared/_services/utility.service';
|
|
import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
|
|
import { PageBookmark } from 'src/app/_models/readers/page-bookmark';
|
|
import { Pagination } from 'src/app/_models/pagination';
|
|
import { Series } from 'src/app/_models/series';
|
|
import { FilterEvent } from 'src/app/_models/metadata/series-filter';
|
|
import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service';
|
|
import { ImageService } from 'src/app/_services/image.service';
|
|
import { JumpbarService } from 'src/app/_services/jumpbar.service';
|
|
import { ReaderService } from 'src/app/_services/reader.service';
|
|
import { SeriesService } from 'src/app/_services/series.service';
|
|
import { DecimalPipe } from '@angular/common';
|
|
import { CardItemComponent } from '../../../cards/card-item/card-item.component';
|
|
import { CardDetailLayoutComponent } from '../../../cards/card-detail-layout/card-detail-layout.component';
|
|
import { BulkOperationsComponent } from '../../../cards/bulk-operations/bulk-operations.component';
|
|
import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
|
|
import {TranslocoDirective, TranslocoService} from "@ngneat/transloco";
|
|
import {FilterField} from "../../../_models/metadata/v2/filter-field";
|
|
import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2";
|
|
|
|
@Component({
|
|
selector: 'app-bookmarks',
|
|
templateUrl: './bookmarks.component.html',
|
|
styleUrls: ['./bookmarks.component.scss'],
|
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
standalone: true,
|
|
imports: [SideNavCompanionBarComponent, BulkOperationsComponent, CardDetailLayoutComponent, CardItemComponent, DecimalPipe, TranslocoDirective]
|
|
})
|
|
export class BookmarksComponent implements OnInit {
|
|
|
|
bookmarks: Array<PageBookmark> = [];
|
|
series: Array<Series> = [];
|
|
loadingBookmarks: boolean = false;
|
|
seriesIds: {[id: number]: number} = {};
|
|
downloadingSeries: {[id: number]: boolean} = {};
|
|
clearingSeries: {[id: number]: boolean} = {};
|
|
actions: ActionItem<Series>[] = [];
|
|
jumpbarKeys: Array<JumpKey> = [];
|
|
|
|
pagination!: Pagination;
|
|
filter: SeriesFilterV2 | undefined = undefined;
|
|
filterSettings: FilterSettings = new FilterSettings();
|
|
filterOpen: EventEmitter<boolean> = new EventEmitter();
|
|
filterActive: boolean = false;
|
|
filterActiveCheck!: SeriesFilterV2;
|
|
|
|
trackByIdentity = (index: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`;
|
|
refresh: EventEmitter<void> = new EventEmitter();
|
|
|
|
private readonly translocoService = inject(TranslocoService);
|
|
|
|
constructor(private readerService: ReaderService, private seriesService: SeriesService,
|
|
private downloadService: DownloadService, private toastr: ToastrService,
|
|
private confirmService: ConfirmService, public bulkSelectionService: BulkSelectionService,
|
|
public imageService: ImageService, private actionFactoryService: ActionFactoryService,
|
|
private router: Router, private readonly cdRef: ChangeDetectorRef,
|
|
private filterUtilityService: FilterUtilitiesService, private route: ActivatedRoute,
|
|
private jumpbarService: JumpbarService) {
|
|
this.filter = this.filterUtilityService.filterPresetsFromUrlV2(this.route.snapshot);
|
|
if (this.filter.statements.length === 0) {
|
|
this.filter!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement());
|
|
}
|
|
this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter();
|
|
this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement());
|
|
this.filterSettings.presetsV2 = this.filter;
|
|
|
|
}
|
|
|
|
ngOnInit(): void {
|
|
this.actions = this.actionFactoryService.getBookmarkActions(this.handleAction.bind(this));
|
|
this.pagination = this.filterUtilityService.pagination(this.route.snapshot);
|
|
}
|
|
|
|
|
|
@HostListener('document:keydown.shift', ['$event'])
|
|
handleKeypress(event: KeyboardEvent) {
|
|
if (event.key === KEY_CODES.SHIFT) {
|
|
this.bulkSelectionService.isShiftDown = true;
|
|
}
|
|
}
|
|
|
|
@HostListener('document:keyup.shift', ['$event'])
|
|
handleKeyUp(event: KeyboardEvent) {
|
|
if (event.key === KEY_CODES.SHIFT) {
|
|
this.bulkSelectionService.isShiftDown = false;
|
|
}
|
|
}
|
|
|
|
async handleAction(action: ActionItem<Series>, series: Series) {
|
|
switch (action.action) {
|
|
case(Action.Delete):
|
|
this.clearBookmarks(series);
|
|
break;
|
|
case(Action.DownloadBookmark):
|
|
this.downloadBookmarks(series);
|
|
break;
|
|
case(Action.ViewSeries):
|
|
this.router.navigate(['library', series.libraryId, 'series', series.id]);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
bulkActionCallback = async (action: ActionItem<any>, data: any) => {
|
|
const selectedSeriesIndexies = this.bulkSelectionService.getSelectedCardsForSource('bookmark');
|
|
const selectedSeries = this.series.filter((series, index: number) => selectedSeriesIndexies.includes(index + ''));
|
|
const seriesIds = selectedSeries.map(item => item.id);
|
|
|
|
switch (action.action) {
|
|
case Action.DownloadBookmark:
|
|
this.downloadService.download('bookmark', this.bookmarks.filter(bmk => seriesIds.includes(bmk.seriesId)), (d) => {
|
|
if (!d) {
|
|
this.bulkSelectionService.deselectAll();
|
|
}
|
|
});
|
|
break;
|
|
case Action.Delete:
|
|
if (!await this.confirmService.confirm(this.translocoService.translate('bookmarks.confirm-delete'))) {
|
|
break;
|
|
}
|
|
|
|
this.readerService.clearMultipleBookmarks(seriesIds).subscribe(() => {
|
|
this.toastr.success(this.translocoService.translate('bookmarks.delete-success'));
|
|
this.bulkSelectionService.deselectAll();
|
|
this.loadBookmarks();
|
|
});
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
loadBookmarks() {
|
|
this.loadingBookmarks = true;
|
|
this.cdRef.markForCheck();
|
|
|
|
this.readerService.getAllBookmarks(this.filter).pipe(take(1)).subscribe(bookmarks => {
|
|
this.bookmarks = bookmarks;
|
|
this.seriesIds = {};
|
|
this.bookmarks.forEach(bmk => {
|
|
if (!this.seriesIds.hasOwnProperty(bmk.seriesId)) {
|
|
this.seriesIds[bmk.seriesId] = 1;
|
|
} else {
|
|
this.seriesIds[bmk.seriesId] += 1;
|
|
}
|
|
this.downloadingSeries[bmk.seriesId] = false;
|
|
this.clearingSeries[bmk.seriesId] = false;
|
|
});
|
|
|
|
const ids = Object.keys(this.seriesIds).map(k => parseInt(k, 10));
|
|
this.seriesService.getAllSeriesByIds(ids).subscribe(series => {
|
|
this.jumpbarKeys = this.jumpbarService.getJumpKeys(series, (t: Series) => t.name);
|
|
this.series = series;
|
|
this.loadingBookmarks = false;
|
|
this.cdRef.markForCheck();
|
|
});
|
|
this.cdRef.markForCheck();
|
|
});
|
|
}
|
|
|
|
viewBookmarks(series: Series) {
|
|
this.router.navigate(['library', series.libraryId, 'series', series.id, 'manga', 0], {queryParams: {incognitoMode: false, bookmarkMode: true}});
|
|
}
|
|
|
|
async clearBookmarks(series: Series) {
|
|
if (!await this.confirmService.confirm(this.translocoService.translate('bookmarks.confirm-single-delete', {seriesName: series.name}))) {
|
|
return;
|
|
}
|
|
|
|
this.clearingSeries[series.id] = true;
|
|
this.cdRef.markForCheck();
|
|
this.readerService.clearBookmarks(series.id).subscribe(() => {
|
|
const index = this.series.indexOf(series);
|
|
if (index > -1) {
|
|
this.series.splice(index, 1);
|
|
}
|
|
this.clearingSeries[series.id] = false;
|
|
this.toastr.success(this.translocoService.translate('delete-single-success', {seriesName: series.name}));
|
|
this.refresh.emit();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
}
|
|
|
|
getBookmarkPages(seriesId: number) {
|
|
return this.seriesIds[seriesId];
|
|
}
|
|
|
|
downloadBookmarks(series: Series) {
|
|
this.downloadingSeries[series.id] = true;
|
|
this.cdRef.markForCheck();
|
|
this.downloadService.download('bookmark', this.bookmarks.filter(bmk => bmk.seriesId === series.id), (d) => {
|
|
if (!d) {
|
|
this.downloadingSeries[series.id] = false;
|
|
this.cdRef.markForCheck();
|
|
}
|
|
});
|
|
}
|
|
|
|
updateFilter(data: FilterEvent) {
|
|
if (data.filterV2 === undefined) return;
|
|
this.filter = data.filterV2;
|
|
|
|
if (!data.isFirst) {
|
|
this.filterUtilityService.updateUrlFromFilterV2(this.pagination, this.filter);
|
|
}
|
|
|
|
this.loadBookmarks();
|
|
}
|
|
|
|
}
|