Misc Changes (#2015)

* Updated ng-bootstrap

* Fixed an issue where jumpbar would be disabled when it shouldn't have been.

* When there are duplicate files that make up a volume, show the count on series detail.

* Added basic ISBN searching which will return a chapter back.
This commit is contained in:
Joe Milazzo 2023-05-26 13:34:23 -05:00 committed by GitHub
parent c57244abd1
commit a2f4bc712c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 53 additions and 51 deletions

View file

@ -1,7 +1,22 @@
import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
import { DOCUMENT } from '@angular/common';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ElementRef, EventEmitter, HostListener,
Inject, Input, OnChanges, OnDestroy, OnInit, Output, TemplateRef, TrackByFunction, ViewChild } from '@angular/core';
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ContentChild,
ElementRef,
EventEmitter,
HostListener,
Inject,
Input,
OnChanges,
OnInit,
Output,
TemplateRef,
TrackByFunction,
ViewChild
} from '@angular/core';
import { Router } from '@angular/router';
import { VirtualScrollerComponent } from '@iharbeck/ngx-virtual-scroller';
import { Subject } from 'rxjs';
@ -22,7 +37,7 @@ import { ScrollService } from 'src/app/_services/scroll.service';
styleUrls: ['./card-detail-layout.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CardDetailLayoutComponent implements OnInit, OnDestroy, OnChanges {
export class CardDetailLayoutComponent implements OnInit, OnChanges {
@Input() header: string = '';
@Input() isLoading: boolean = false;
@ -67,8 +82,6 @@ export class CardDetailLayoutComponent implements OnInit, OnDestroy, OnChanges {
updateApplied: number = 0;
hasResumedJumpKey: boolean = false;
private onDestory: Subject<void> = new Subject();
get Breakpoint() {
return Breakpoint;
}
@ -99,6 +112,8 @@ export class CardDetailLayoutComponent implements OnInit, OnDestroy, OnChanges {
this.changeDetectionRef.markForCheck();
}
console.log('filterSettings: ', this.filterSettings)
if (this.pagination === undefined) {
this.pagination = {currentPage: 1, itemsPerPage: this.items.length, totalItems: this.items.length, totalPages: 1};
this.changeDetectionRef.markForCheck();
@ -138,14 +153,8 @@ export class CardDetailLayoutComponent implements OnInit, OnDestroy, OnChanges {
}
}
ngOnDestroy() {
this.onDestory.next();
this.onDestory.complete();
}
hasCustomSort() {
return this.filter.sortOptions !== null || this.filterSettings?.presets?.sortOptions !== null;
return this.filter.sortOptions !== null || this.filterSettings?.presets?.sortOptions !== undefined;
}
performAction(action: ActionItem<any>) {