Merge branch 'RED-8578' into 'master'

RED-8578: fixed hard-delete error still appearing.

See merge request redactmanager/red-ui!320
This commit is contained in:
Valentin-Gabriel Mihai 2024-02-26 14:51:56 +01:00
commit ac895da1c8

View File

@ -43,6 +43,7 @@ import { merge, Observable } from 'rxjs';
import { filter, skip, switchMap, tap } from 'rxjs/operators';
import { ConfigService } from '../config.service';
import { BulkActionsService } from '../services/bulk-actions.service';
import { DossiersCacheService } from '@services/dossiers/dossiers-cache.service';
@Component({
templateUrl: './dossier-overview-screen.component.html',
@ -92,6 +93,7 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
private readonly _fileDropOverlayService: FileDropOverlayService,
private readonly _dossierTemplatesService: DossierTemplatesService,
private readonly _dossierAttributesService: DossierAttributesService,
private readonly _dossiersCacheService: DossiersCacheService,
) {
super();
this.dossier$ = _dossiersService.getEntityChanged$(this.dossierId).pipe(tap(dossier => (this.#dossier = dossier)));
@ -121,7 +123,7 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
get #dossierFilesChange$() {
return this._dossiersService.dossierFileChanges$.pipe(
filter(dossierId => dossierId === this.dossierId),
filter(dossierId => dossierId === this.dossierId && !!this._dossiersCacheService.get(dossierId)),
switchMap(dossierId => this._filesService.loadAll(dossierId)),
);
}