
* 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>
296 lines
13 KiB
TypeScript
296 lines
13 KiB
TypeScript
import {DOCUMENT, NgIf, NgStyle} from '@angular/common';
|
|
import {
|
|
AfterContentChecked,
|
|
ChangeDetectionStrategy,
|
|
ChangeDetectorRef,
|
|
Component,
|
|
DestroyRef,
|
|
ElementRef,
|
|
EventEmitter,
|
|
HostListener,
|
|
inject,
|
|
Inject,
|
|
OnInit,
|
|
ViewChild
|
|
} from '@angular/core';
|
|
import {Title} from '@angular/platform-browser';
|
|
import {ActivatedRoute, Router} from '@angular/router';
|
|
import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
|
|
import {ToastrService} from 'ngx-toastr';
|
|
import {debounceTime, take} from 'rxjs/operators';
|
|
import {BulkSelectionService} from 'src/app/cards/bulk-selection.service';
|
|
import {EditCollectionTagsComponent} from 'src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component';
|
|
import {FilterSettings} from 'src/app/metadata-filter/filter-settings';
|
|
import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service';
|
|
import {KEY_CODES, UtilityService} from 'src/app/shared/_services/utility.service';
|
|
import {CollectionTag} from 'src/app/_models/collection-tag';
|
|
import {SeriesAddedToCollectionEvent} from 'src/app/_models/events/series-added-to-collection-event';
|
|
import {JumpKey} from 'src/app/_models/jumpbar/jump-key';
|
|
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 {ActionService} from 'src/app/_services/action.service';
|
|
import {CollectionTagService} from 'src/app/_services/collection-tag.service';
|
|
import {ImageService} from 'src/app/_services/image.service';
|
|
import {JumpbarService} from 'src/app/_services/jumpbar.service';
|
|
import {EVENTS, MessageHubService} from 'src/app/_services/message-hub.service';
|
|
import {ScrollService} from 'src/app/_services/scroll.service';
|
|
import {SeriesService} from 'src/app/_services/series.service';
|
|
import {SeriesCardComponent} from '../../../cards/series-card/series-card.component';
|
|
import {CardDetailLayoutComponent} from '../../../cards/card-detail-layout/card-detail-layout.component';
|
|
import {BulkOperationsComponent} from '../../../cards/bulk-operations/bulk-operations.component';
|
|
import {ReadMoreComponent} from '../../../shared/read-more/read-more.component';
|
|
import {ImageComponent} from '../../../shared/image/image.component';
|
|
|
|
import {
|
|
SideNavCompanionBarComponent
|
|
} from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
|
|
import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
|
|
import {TranslocoDirective, TranslocoService} from "@ngneat/transloco";
|
|
import {CardActionablesComponent} from "../../../_single-module/card-actionables/card-actionables.component";
|
|
import {FilterField} from "../../../_models/metadata/v2/filter-field";
|
|
import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison";
|
|
import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2";
|
|
|
|
@Component({
|
|
selector: 'app-collection-detail',
|
|
templateUrl: './collection-detail.component.html',
|
|
styleUrls: ['./collection-detail.component.scss'],
|
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
standalone: true,
|
|
imports: [NgIf, SideNavCompanionBarComponent, CardActionablesComponent, NgStyle, ImageComponent, ReadMoreComponent, BulkOperationsComponent, CardDetailLayoutComponent, SeriesCardComponent, TranslocoDirective]
|
|
})
|
|
export class CollectionDetailComponent implements OnInit, AfterContentChecked {
|
|
|
|
@ViewChild('scrollingBlock') scrollingBlock: ElementRef<HTMLDivElement> | undefined;
|
|
@ViewChild('companionBar') companionBar: ElementRef<HTMLDivElement> | undefined;
|
|
|
|
destroyRef = inject(DestroyRef);
|
|
translocoService = inject(TranslocoService);
|
|
|
|
collectionTag!: CollectionTag;
|
|
tagImage: string = '';
|
|
isLoading: boolean = true;
|
|
series: Array<Series> = [];
|
|
pagination!: Pagination;
|
|
collectionTagActions: ActionItem<CollectionTag>[] = [];
|
|
filter: SeriesFilterV2 | undefined = undefined;
|
|
filterSettings: FilterSettings = new FilterSettings();
|
|
summary: string = '';
|
|
|
|
actionInProgress: boolean = false;
|
|
filterActiveCheck!: SeriesFilterV2;
|
|
filterActive: boolean = false;
|
|
|
|
jumpbarKeys: Array<JumpKey> = [];
|
|
|
|
filterOpen: EventEmitter<boolean> = new EventEmitter();
|
|
trackByIdentity = (index: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`;
|
|
|
|
|
|
bulkActionCallback = (action: ActionItem<any>, data: any) => {
|
|
const selectedSeriesIndices = this.bulkSelectionService.getSelectedCardsForSource('series');
|
|
const selectedSeries = this.series.filter((series, index: number) => selectedSeriesIndices.includes(index + ''));
|
|
|
|
switch (action.action) {
|
|
case Action.AddToReadingList:
|
|
this.actionService.addMultipleSeriesToReadingList(selectedSeries, (success) => {
|
|
if (success) this.bulkSelectionService.deselectAll();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.AddToWantToReadList:
|
|
this.actionService.addMultipleSeriesToWantToReadList(selectedSeries.map(s => s.id), () => {
|
|
this.bulkSelectionService.deselectAll();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.RemoveFromWantToReadList:
|
|
this.actionService.removeMultipleSeriesFromWantToReadList(selectedSeries.map(s => s.id), () => {
|
|
this.bulkSelectionService.deselectAll();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.AddToCollection:
|
|
this.actionService.addMultipleSeriesToCollectionTag(selectedSeries, (success) => {
|
|
if (success) this.bulkSelectionService.deselectAll();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.MarkAsRead:
|
|
this.actionService.markMultipleSeriesAsRead(selectedSeries, () => {
|
|
this.bulkSelectionService.deselectAll();
|
|
this.loadPage();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.MarkAsUnread:
|
|
this.actionService.markMultipleSeriesAsUnread(selectedSeries, () => {
|
|
this.bulkSelectionService.deselectAll();
|
|
this.loadPage();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
case Action.Delete:
|
|
this.actionService.deleteMultipleSeries(selectedSeries, successful => {
|
|
if (!successful) return;
|
|
this.bulkSelectionService.deselectAll();
|
|
this.loadPage();
|
|
this.cdRef.markForCheck();
|
|
});
|
|
break;
|
|
}
|
|
}
|
|
|
|
get ScrollingBlockHeight() {
|
|
if (this.scrollingBlock === undefined) return 'calc(var(--vh)*100)';
|
|
const navbar = this.document.querySelector('.navbar') as HTMLElement;
|
|
if (navbar === null) return 'calc(var(--vh)*100)';
|
|
|
|
const companionHeight = this.companionBar!.nativeElement.offsetHeight;
|
|
const navbarHeight = navbar.offsetHeight;
|
|
const totalHeight = companionHeight + navbarHeight + 21; //21px to account for padding
|
|
return 'calc(var(--vh)*100 - ' + totalHeight + 'px)';
|
|
}
|
|
|
|
constructor(public imageService: ImageService, private collectionService: CollectionTagService, private router: Router, private route: ActivatedRoute,
|
|
private seriesService: SeriesService, private toastr: ToastrService, private actionFactoryService: ActionFactoryService,
|
|
private modalService: NgbModal, private titleService: Title, private jumpbarService: JumpbarService,
|
|
public bulkSelectionService: BulkSelectionService, private actionService: ActionService, private messageHub: MessageHubService,
|
|
private filterUtilityService: FilterUtilitiesService, private utilityService: UtilityService, @Inject(DOCUMENT) private document: Document,
|
|
private readonly cdRef: ChangeDetectorRef, private scrollService: ScrollService) {
|
|
this.router.routeReuseStrategy.shouldReuseRoute = () => false;
|
|
|
|
const routeId = this.route.snapshot.paramMap.get('id');
|
|
if (routeId === null) {
|
|
this.router.navigate(['collections']);
|
|
return;
|
|
}
|
|
const tagId = parseInt(routeId, 10);
|
|
|
|
this.pagination = this.filterUtilityService.pagination(this.route.snapshot);
|
|
|
|
this.filter = this.filterUtilityService.filterPresetsFromUrlV2(this.route.snapshot);
|
|
if (this.filter.statements.filter(stmt => stmt.field === FilterField.Libraries).length === 0) {
|
|
this.filter!.statements.push({field: FilterField.CollectionTags, value: tagId + '', comparison: FilterComparison.Equal});
|
|
}
|
|
this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter();
|
|
this.filterActiveCheck!.statements.push({field: FilterField.CollectionTags, value: tagId + '', comparison: FilterComparison.Equal});
|
|
this.filterSettings.presetsV2 = this.filter;
|
|
|
|
this.cdRef.markForCheck();
|
|
|
|
this.updateTag(tagId);
|
|
}
|
|
|
|
ngOnInit(): void {
|
|
this.collectionTagActions = this.actionFactoryService.getCollectionTagActions(this.handleCollectionActionCallback.bind(this));
|
|
|
|
this.messageHub.messages$.pipe(takeUntilDestroyed(this.destroyRef), debounceTime(2000)).subscribe(event => {
|
|
if (event.event == EVENTS.SeriesAddedToCollection) {
|
|
const collectionEvent = event.payload as SeriesAddedToCollectionEvent;
|
|
if (collectionEvent.tagId === this.collectionTag.id) {
|
|
this.loadPage();
|
|
}
|
|
} else if (event.event === EVENTS.SeriesRemoved) {
|
|
this.loadPage();
|
|
}
|
|
});
|
|
}
|
|
|
|
ngAfterContentChecked(): void {
|
|
this.scrollService.setScrollContainer(this.scrollingBlock);
|
|
}
|
|
|
|
@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;
|
|
}
|
|
}
|
|
|
|
updateTag(tagId: number) {
|
|
this.collectionService.allTags().subscribe(tags => {
|
|
const matchingTags = tags.filter(t => t.id === tagId);
|
|
if (matchingTags.length === 0) {
|
|
this.toastr.error(this.translocoService.translate('errors.collection-invalid-access'));
|
|
// TODO: Why would access need to be checked? Even if a id was guessed, the series wouldn't return
|
|
this.router.navigateByUrl('/');
|
|
return;
|
|
}
|
|
|
|
this.collectionTag = matchingTags[0];
|
|
this.summary = (this.collectionTag.summary === null ? '' : this.collectionTag.summary).replace(/\n/g, '<br>');
|
|
// TODO: This can be changed now that we have app-image and collection cover merge code
|
|
this.tagImage = this.imageService.randomize(this.imageService.getCollectionCoverImage(this.collectionTag.id));
|
|
this.titleService.setTitle(this.translocoService.translate('errors.collection-invalid-access', {collectionName: this.collectionTag.title}));
|
|
// TODO: BUG: This title key is incorrect!
|
|
this.cdRef.markForCheck();
|
|
});
|
|
}
|
|
|
|
loadPage() {
|
|
this.filterActive = !this.utilityService.deepEqual(this.filter, this.filterActiveCheck);
|
|
this.isLoading = true;
|
|
this.cdRef.markForCheck();
|
|
|
|
this.seriesService.getAllSeriesV2(undefined, undefined, this.filter).pipe(take(1)).subscribe(series => {
|
|
this.series = series.result;
|
|
this.pagination = series.pagination;
|
|
this.jumpbarKeys = this.jumpbarService.getJumpKeys(this.series, (series: Series) => series.name);
|
|
this.isLoading = false;
|
|
window.scrollTo(0, 0);
|
|
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.loadPage();
|
|
}
|
|
|
|
handleCollectionActionCallback(action: ActionItem<CollectionTag>, collectionTag: CollectionTag) {
|
|
switch (action.action) {
|
|
case(Action.Edit):
|
|
this.openEditCollectionTagModal(this.collectionTag);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
performAction(action: ActionItem<any>) {
|
|
if (typeof action.callback === 'function') {
|
|
action.callback(action, this.collectionTag);
|
|
}
|
|
}
|
|
|
|
openEditCollectionTagModal(collectionTag: CollectionTag) {
|
|
const modalRef = this.modalService.open(EditCollectionTagsComponent, { size: 'lg', scrollable: true });
|
|
modalRef.componentInstance.tag = this.collectionTag;
|
|
modalRef.closed.subscribe((results: {success: boolean, coverImageUpdated: boolean}) => {
|
|
this.updateTag(this.collectionTag.id);
|
|
this.loadPage();
|
|
if (results.coverImageUpdated) {
|
|
this.tagImage = this.imageService.randomize(this.imageService.getCollectionCoverImage(collectionTag.id));
|
|
this.collectionTag.coverImage = this.imageService.randomize(this.imageService.getCollectionCoverImage(collectionTag.id));
|
|
this.cdRef.markForCheck();
|
|
}
|
|
});
|
|
}
|
|
|
|
}
|