Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

loadIfChanged handle dossier deleted

Browse Source
This commit is contained in:
Dan Percic 2022-02-18 18:55:11 +02:00
parent 12bbbcdad2
commit 146fb5bee2
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/red-ui/src/app/services/entity-services/dossiers.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable, Injector } from '@angular/core'; import { Injectable, Injector } from '@angular/core';
import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui';
import { Dossier, IDossier, IDossierRequest } from '@red/domain'; import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain';
import { catchError, filter, map, mapTo, switchMap, tap } from 'rxjs/operators'; import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators';
import { combineLatest, firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs'; import { combineLatest, firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
@ -63,11 +63,22 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
); );
} }
loadOnlyChanged(): Observable<ChangesDetails> { loadOnlyChanged(): Observable<DossierChanges> {
const load = (changes: DossierChanges) => forkJoin(changes.map(change => this._load(change.dossierId))); const removeIfNotFound = (id: string) =>
catchError((error: HttpErrorResponse) => {
if (error.status === HttpStatusCode.NotFound) {
this.remove(id);
return of([]);
}
return throwError(() => error);
});
const load = (changes: DossierChanges) =>
changes.map(change => this._load(change.dossierId).pipe(removeIfNotFound(change.dossierId)));
return this.hasChangesDetails$().pipe( return this.hasChangesDetails$().pipe(
switchMap(changes => load(changes.dossierChanges).pipe(mapTo(changes))), pluck('dossierChanges'),
switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))),
tap(() => this._updateLastChanged()), tap(() => this._updateLastChanged()),
); );
} }
@ -122,16 +133,16 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length;
} }
private _load(id: string, queryParams?: List<QueryParam>): Observable<Dossier> { private _load(id: string, queryParams?: List<QueryParam>): Observable<DossierStats[]> {
return super._getOne([id], this._defaultModelPath, queryParams).pipe( return super._getOne([id], this._defaultModelPath, queryParams).pipe(
map(entity => new Dossier(entity)), map(entity => new Dossier(entity)),
switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId]).pipe(mapTo(dossier))),
tap(dossier => this.replace(dossier)), tap(dossier => this.replace(dossier)),
switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId])),
); );
} }
#emitFileChanges(changes: ChangesDetails): void { #emitFileChanges(dossierChanges: DossierChanges): void {
changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId));
} }
#computeStats(entities: List<Dossier>): IDossiersStats { #computeStats(entities: List<Dossier>): IDossiersStats {

2
libs/common-ui

@ -1 +1 @@
Subproject commit a9cddbf19b985c887bc772aec6fdd862d1dc848a Subproject commit ab4568eb9d6a099b23ce4df07702e3f834fd8a5b