ngx-edu-sharing-metaqs2 0.9.37 → 0.9.38

package/lib/collection-count-history/collection-count-history.component.d.ts

@@ -21,7 +21,7 @@ export declare class CollectionCountHistoryComponent implements OnInit {
     protected granularities: DateTimeUnit[];
     protected granularity: FormControl<DateTimeUnit>;
     pageTitle: string;
-    isHistoryEnabled: import("@angular/core").WritableSignal<boolean>;
+    readonly isHistoryEnabled: import("@angular/core").WritableSignal<boolean>;
     constructor(metaApi: MetaApiService, destroyRef: DestroyRef);
     ngOnInit(): void;
     registerDateRangeFilter(): void;

package/lib/collection-count-history/monthpicker/monthpicker.component.d.ts

@@ -14,7 +14,6 @@ export declare class MonthpickerComponent implements OnInit, OnDestroy {
     disabled: boolean;
     protected start: ElementRef<HTMLInputElement>;
     protected readonly ripple: MatRipple;
-    constructor();
     protected setStart(date: DateTime<boolean>, picker: MatDatepicker<DateTime<boolean>>): void;
     protected setEnd(date: DateTime<boolean>, picker: MatDatepicker<DateTime<boolean>>): void;
     ngOnInit(): void;

package/lib/components/quality-matrix/quality_matrix.d.ts

@@ -1,5 +1,5 @@
-import { AfterViewChecked } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { AfterViewChecked, DestroyRef, ElementRef, OnInit } from '@angular/core';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { MetaApiService } from '../../meta-api.service';
 import { FilterValue, QualityMatrix, QualityMatrixHeader, QualityMatrixRow } from '../../java-api';
 import { FormControl, FormGroup, FormRecord } from '@angular/forms';
@@ -10,26 +10,32 @@ import { KeyValue } from '@angular/common';
 import { Overlay } from '@angular/cdk/overlay';
 import { TooltipService } from '../../core/tooltip.service';
 import * as i0 from "@angular/core";
-export declare class QualityMatrixComponent implements AfterViewChecked {
-    private readonly metaApi;
-    private readonly linkService;
-    private readonly overlay;
-    private readonly tooltipService;
-    private readonly ref;
+export declare class QualityMatrixComponent implements OnInit, AfterViewChecked {
+    protected readonly ref: ElementRef<any>;
+    protected readonly destroyRef: DestroyRef;
+    protected readonly metaApi: MetaApiService;
+    protected readonly linkService: EditorialLinkService;
+    protected readonly overlay: Overlay;
+    protected readonly tooltipService: TooltipService;
     private readonly scrollLeft;
     private readonly scrollWidth;
     readonly isLeftScrollable: import("@angular/core").Signal<boolean>;
     readonly isRightScrollable: import("@angular/core").Signal<boolean | undefined>;
     private readonly issueTypeHeader;
-    filteredColumns: QualityMatrixHeader[];
-    datatableColumns: Array<string>;
-    showHistoricalData: FormControl<boolean | null>;
-    onlySourcesWithMaterial: FormControl<boolean | null>;
-    categoryControls: FormRecord<FormControl<string[]>>;
-    isLoading: import("@angular/core").WritableSignal<boolean>;
+    readonly filteredColumns: import("@angular/core").Signal<QualityMatrixHeader[]>;
+    readonly datatableColumns: import("@angular/core").Signal<string[]>;
+    readonly isHistoricalDataEnabledFormField: FormControl<boolean | null>;
+    readonly isHistoricalDataEnabled: import("@angular/core").Signal<boolean | null | undefined>;
+    readonly isOnlySourcesWithMaterialEnabledFormField: FormControl<boolean | null>;
+    readonly isOnlySourcesWithMaterialEnabled: import("@angular/core").Signal<boolean | null | undefined>;
+    readonly categoryControls: FormRecord<FormControl<string[]>>;
+    readonly loadingCount: import("@angular/core").WritableSignal<number>;
+    readonly isLoading: import("@angular/core").Signal<boolean>;
     private readonly scrollMarkers;
     readonly categoryFilterValues: Map<string, FilterValue[]>;
+    protected readonly refresh$: Subject<void>;
     readonly recentQualityMatrix$: BehaviorSubject<QualityMatrix>;
+    readonly recentQualityMatrix: import("@angular/core").Signal<QualityMatrix>;
     readonly pastQualityMatrix$: BehaviorSubject<QualityMatrix | null>;
     readonly range: FormGroup<{
         start: FormControl<DateTime<boolean>>;
@@ -38,26 +44,22 @@ export declare class QualityMatrixComponent implements AfterViewChecked {
     private readonly tooltips;
     protected readonly DateTime: typeof DateTime;
     pageTitle: string;
-    constructor(metaApi: MetaApiService, linkService: EditorialLinkService, overlay: Overlay, tooltipService: TooltipService);
+    readonly allColumns: import("@angular/core").Signal<QualityMatrixHeader[]>;
     ngAfterViewChecked(): void;
     filterIdent(_index: number, item: KeyValue<string, FormControl<string[]>>): string;
-    get qualityMatrix(): QualityMatrix;
-    get sourceColumns(): string[];
-    get currentColumns(): string[];
-    get pastColumns(): string[];
-    get allDataColumns(): string[];
-    private filterTableBySourcesWithMaterial;
-    registerDateRangeFilter(): void;
-    private registerCategoryFilters;
-    private onLoadedDataChanges;
-    private loadDataForStart;
-    private loadDataForEnd;
-    private getCurrentFilterValues;
-    private loadDataWithCurrentlySelectedFilters;
+    sourceColumns: import("@angular/core").Signal<string[]>;
+    currentColumns: import("@angular/core").Signal<string[]>;
+    pastColumns: import("@angular/core").Signal<string[]>;
+    allDataColumns: import("@angular/core").Signal<string[]>;
+    private loadData;
+    private transformCategoryFilters;
+    private loadPastData;
+    private loadCurrentData;
     openEditLink(source: string, issue: string): void;
     columnIdent(_index: number, col: QualityMatrixHeader): string;
-    refresh(): Promise<void>;
+    refresh(): void;
     getPastColumn(columnId: string): QualityMatrixHeader | undefined;
+    ngOnInit(): void;
     getTrend(row: QualityMatrixRow, column: QualityMatrixHeader): {
         delta?: number;
         trend?: string;

package/lib/counts-with-history/counts-with-history.component.d.ts

@@ -1,52 +1,70 @@
 import { DestroyRef, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, Observable, Subject, Unsubscribable } from 'rxjs';
 import { MetaApiService } from '../meta-api.service';
 import { Filter, MatrixRowWithCounts, MatrixWithCounts, QualityMatrixHeader } from '../java-api';
 import { DateTime } from 'luxon';
 import { FormControl, FormGroup } from '@angular/forms';
 import { EditorialLinkService } from '../components/editorial-link-service/editorial-link.service';
 import * as i0 from "@angular/core";
-export type MethodType = ((it: Filter[]) => Observable<MatrixWithCounts>) | ((x: string, it: Filter[]) => Observable<MatrixWithCounts>);
 export type PickKeysByPropertyType<TObject extends object, TPropertyType> = {
     [TKey in keyof TObject]: TObject[TKey] extends TPropertyType ? TKey : never;
 }[keyof TObject];
-export declare class CountsWithHistoryComponent implements OnInit {
+export declare abstract class BaseHistoricDataTableDirective<TLoadingData extends object, TMethodType extends MetaApiService[keyof MetaApiService] & Function> {
     protected readonly metaApi: MetaApiService;
     protected readonly destroyRef: DestroyRef;
-    private readonly linkService;
-    protected readonly loadingCount: import("@angular/core").WritableSignal<number>;
+    protected readonly linkService: EditorialLinkService;
+    apiMethod: PickKeysByPropertyType<MetaApiService, TMethodType>;
+    columnTranslationkey: string | null;
+    pageTitle: string;
+    sourceType: 'replicationSource' | 'collection';
+    protected loadingCount: import("@angular/core").WritableSignal<number>;
     protected readonly isLoading: import("@angular/core").Signal<boolean>;
+    readonly isHistoryEnabled: import("@angular/core").WritableSignal<boolean>;
+    protected readonly isHistoryEnabled$: Observable<boolean>;
     protected readonly timeFilterLoaded: import("@angular/core").WritableSignal<boolean>;
-    protected readonly recentTypeCount$: BehaviorSubject<MatrixWithCounts>;
-    protected readonly pastTypeCount$: BehaviorSubject<MatrixWithCounts>;
+    protected recentTypeCount$: BehaviorSubject<MatrixWithCounts>;
+    protected pastTypeCount$: BehaviorSubject<MatrixWithCounts>;
     protected readonly DateTime: typeof DateTime;
     columns: import("@angular/core").WritableSignal<QualityMatrixHeader[]>;
-    apiMethod: PickKeysByPropertyType<MetaApiService, MethodType>;
-    columnTranslationkey: string | null;
-    pageTitle: string;
-    sourceType: 'replicationSource' | 'collection';
+    protected readonly dataForPastData$: Subject<Partial<TLoadingData>>;
+    protected readonly dataForRecentData$: Subject<Partial<TLoadingData>>;
+    protected readonly startValues$: Observable<MatrixWithCounts>;
+    protected readonly endValues$: Observable<MatrixWithCounts>;
+    protected startDateSubscription: Unsubscribable | undefined;
+    protected startValuesSubscription: Unsubscribable | undefined;
     readonly range: FormGroup<{
         start: FormControl<DateTime<boolean>>;
         end: FormControl<DateTime<boolean>>;
     }>;
-    readonly isHistoryEnabled: import("@angular/core").WritableSignal<boolean>;
+    protected readonly timerangeStart$: Observable<DateTime<true>>;
     readonly allColumns: import("@angular/core").Signal<string[]>;
     readonly typeColumns: import("@angular/core").Signal<string[]>;
     readonly recentColumns: import("@angular/core").Signal<string[]>;
     readonly pastColumns: import("@angular/core").Signal<string[]>;
-    constructor(metaApi: MetaApiService, destroyRef: DestroyRef, linkService: EditorialLinkService);
-    ngOnInit(): void;
+    protected abstract getCountByDate(date: TLoadingData): Observable<MatrixWithCounts>;
+    protected abstract validateLoadingData(data: Partial<TLoadingData>): data is TLoadingData;
+    protected abstract compareLoadingDataEqual(a: TLoadingData, b: TLoadingData): boolean;
+    protected getAvailableDateRange(): Observable<Filter>;
     private getStartDateOfRange;
     columnIdent(_index: number, col: QualityMatrixHeader): string;
-    private getAvailableDateRange;
-    protected getValuesInDateRange(): Observable<[MatrixWithCounts, MatrixWithCounts]>;
-    protected getCountByDate(date: DateTime): Observable<MatrixWithCounts>;
-    protected pastTypeCount(row: MatrixRowWithCounts, columnid: string): {
+    pastTypeCount(row: MatrixRowWithCounts, columnid: string): {
         delta?: number;
         trend?: string;
         value?: number;
     };
-    protected openInEditor(sourceId: string, issueId: string): Observable<string | null>;
+    openInEditor(sourceId: string, issueId: string): Observable<string | null>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BaseHistoricDataTableDirective<any, any>, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<BaseHistoricDataTableDirective<any, any>, never, never, { "apiMethod": { "alias": "apiMethod"; "required": false; }; "columnTranslationkey": { "alias": "columnTranslationkey"; "required": false; }; "pageTitle": { "alias": "pageTitle"; "required": false; }; "sourceType": { "alias": "sourceType"; "required": true; }; }, {}, never, never, false, never>;
+}
+type LoadingData = {
+    date: DateTime;
+};
+export declare class CountsWithHistoryComponent extends BaseHistoricDataTableDirective<LoadingData, (filters: Filter[]) => Observable<MatrixWithCounts>> implements OnInit {
+    ngOnInit(): void;
+    protected getCountByDate(data: LoadingData): Observable<MatrixWithCounts>;
+    protected validateLoadingData(data: Partial<LoadingData>): data is LoadingData;
+    protected compareLoadingDataEqual(a: LoadingData, b: LoadingData): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<CountsWithHistoryComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CountsWithHistoryComponent, "metaqs2-counts-with-history", never, { "apiMethod": { "alias": "apiMethod"; "required": true; }; "columnTranslationkey": { "alias": "columnTranslationkey"; "required": false; }; "pageTitle": { "alias": "pageTitle"; "required": false; }; "sourceType": { "alias": "sourceType"; "required": true; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<CountsWithHistoryComponent, "metaqs2-counts-with-history", never, {}, {}, never, never, true, never>;
 }
+export {};

package/lib/meta-api.service.d.ts

@@ -25,7 +25,7 @@ export declare class MetaApiService {
     getEditorialMaterialCounts(body: MaterialCountFilter): Observable<import("./java-api").MaterialCountDto[]>;
     getMaterialTypeCountsByReplicationSource(body: Filter[]): Observable<MatrixWithCounts>;
     getLicenseCountsByReplicationSource(body: Filter[]): Observable<MatrixWithCounts>;
-    getLicenseCountsByLicenseGroup(colId: string, filters: Filter[]): Observable<MatrixWithCounts>;
+    getLicenseCountsByLicenseGroup(colId: string, filters: Filter[]): Observable<QualityMatrix>;
     getMaterialCountMatrixByLicenseGroup(body: Filter[]): Observable<MatrixWithCounts>;
     getCompletenessForDisciplinaryPortals(body: Filter[]): Observable<MatrixWithCounts>;
     getCompletenessForReplicationSources(body: Filter[]): Observable<MatrixWithCounts>;

package/lib/tree-license/tree-license.component.d.ts

@@ -1,17 +1,22 @@
 import { OnInit } from '@angular/core';
-import { CountsWithHistoryComponent, MethodType, PickKeysByPropertyType } from '../counts-with-history/counts-with-history.component';
+import { BaseHistoricDataTableDirective } from '../counts-with-history/counts-with-history.component';
 import { Observable } from 'rxjs';
-import { MatrixWithCounts } from '../java-api';
+import { Filter, MatrixWithCounts, QualityMatrix } from '../java-api';
 import { DateTime } from 'luxon';
-import { MetaApiService } from '../meta-api.service';
 import * as i0 from "@angular/core";
-export declare class TreeLicenseComponent extends CountsWithHistoryComponent implements OnInit {
+type LoadingData = {
+    date: DateTime;
+    collectionId: string;
+};
+export declare class TreeLicenseComponent extends BaseHistoricDataTableDirective<LoadingData, (collectionId: string, filters: Filter[]) => Observable<QualityMatrix>> implements OnInit {
     private colId$;
     set collectionId(id: string);
     sourceType: 'replicationSource' | 'collection';
-    apiMethod: PickKeysByPropertyType<MetaApiService, MethodType>;
-    protected getCountByDate(date: DateTime): Observable<MatrixWithCounts>;
+    protected getCountByDate(data: LoadingData): Observable<MatrixWithCounts>;
     ngOnInit(): void;
+    protected validateLoadingData(data: Partial<LoadingData>): data is LoadingData;
+    protected compareLoadingDataEqual(a: LoadingData, b: LoadingData): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<TreeLicenseComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TreeLicenseComponent, "metaqs2-tree-license", never, { "collectionId": { "alias": "collectionId"; "required": true; }; "sourceType": { "alias": "sourceType"; "required": false; }; "apiMethod": { "alias": "apiMethod"; "required": false; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TreeLicenseComponent, "metaqs2-tree-license", never, { "collectionId": { "alias": "collectionId"; "required": true; }; "sourceType": { "alias": "sourceType"; "required": false; }; }, {}, never, never, true, never>;
 }
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "ngx-edu-sharing-metaqs2",
   "description": "OEH MetaQS widgets library",
   "license": "GNU GPL v2",
-  "version": "0.9.37",
+  "version": "0.9.38",
   "author": "Torsten Simon",
   "peerDependencies": {
     "@angular/common": ">=16.0.0",