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

Angular 15 (#1765)

Browse source 
* Refactored some code in BookService to make the code easier to understand

* More lint fixes

* Use npm ci for installs in pipeline

* Fixed build system again by deleting nodejs. New build system uses package-lcok going forward.
This commit is contained in:
Joe Milazzo 2023-01-30 10:47:34 -08:00 • committed by GitHub
parent 72737ceff2
commit d09e458e85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1418 additions and 4984 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UI/Web/src/app/cards/card-item/card-item.component.ts
View file

@ -213,6 +213,7 @@ export class CardItemComponent implements OnInit, OnDestroy {
});
this.download$ = this.downloadService.activeDownloads$.pipe(takeUntil(this.onDestroy), map((events) => {
console.log('Active downloads: ', events);
if(this.utilityService.isSeries(this.entity)) return events.find(e => e.entityType === 'series' && e.subTitle === this.downloadService.downloadSubtitle('series', (this.entity as Series))) || null;
if(this.utilityService.isVolume(this.entity)) return events.find(e => e.entityType === 'volume' && e.subTitle === this.downloadService.downloadSubtitle('volume', (this.entity as Volume))) || null;
if(this.utilityService.isChapter(this.entity)) return events.find(e => e.entityType === 'chapter' && e.subTitle === this.downloadService.downloadSubtitle('chapter', (this.entity as Chapter))) || null;

8
UI/Web/src/app/statistics/_components/file-breakdown-stats/file-breakdown-stats.component.ts
View file

@ -1,9 +1,8 @@
import { ChangeDetectionStrategy, Component, OnInit, QueryList, ViewChildren } from '@angular/core';
import { ChangeDetectionStrategy, Component, OnDestroy, QueryList, ViewChildren } from '@angular/core';
import { FormControl } from '@angular/forms';
import { LegendPosition } from '@swimlane/ngx-charts';
import { Observable, Subject, BehaviorSubject, combineLatest, map, takeUntil, shareReplay } from 'rxjs';
import { MangaFormatPipe } from 'src/app/pipe/manga-format.pipe';
import { MangaFormat } from 'src/app/_models/manga-format';
import { StatisticsService } from 'src/app/_services/statistics.service';
import { SortableHeader, SortEvent, compare } from 'src/app/_single-module/table/_directives/sortable-header.directive';
import { FileExtension, FileExtensionBreakdown } from '../../_models/file-breakdown';
@ -22,7 +21,7 @@ const mangaFormatPipe = new MangaFormatPipe();
styleUrls: ['./file-breakdown-stats.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FileBreakdownStatsComponent implements OnInit {
export class FileBreakdownStatsComponent implements OnDestroy {
@ViewChildren(SortableHeader<PieDataItem>) headers!: QueryList<SortableHeader<PieDataItem>>;
@ -71,9 +70,6 @@ export class FileBreakdownStatsComponent implements OnInit {
})));
}
ngOnInit(): void {
}
ngOnDestroy(): void {
this.onDestroy.next();
this.onDestroy.complete();

4
UI/Web/src/app/statistics/_components/manga-format-stats/manga-format-stats.component.ts
View file

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, OnInit, QueryList, ViewChildren } from '@angular/core';
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
import { FormControl } from '@angular/forms';
import { LegendPosition } from '@swimlane/ngx-charts';
import { Observable, Subject, BehaviorSubject, combineLatest, map, takeUntil } from 'rxjs';
@ -12,7 +12,7 @@ import { PieDataItem } from '../../_models/pie-data-item';
styleUrls: ['./manga-format-stats.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class MangaFormatStatsComponent implements OnInit {
export class MangaFormatStatsComponent implements OnInit, OnDestroy {
@ViewChildren(SortableHeader<PieDataItem>) headers!: QueryList<SortableHeader<PieDataItem>>;

15
UI/Web/src/main.ts
View file

@ -1,22 +1,7 @@
/// <reference types="@angular/localize" />
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
if (environment.production) {
enableProdMode();
}
// function fetchConfig(): Promise<ConfigData> {
// return fetch(environment.apiUrl + 'settings/base-url')
// .then(response => response.text())
// .then(response => new ConfigData(response));
// }
// fetchConfig().then(config => {
// });
platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.error(err));