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

RED-3070 fix

Browse Source
This commit is contained in:
Adina Țeudan 2022-01-13 12:53:39 +02:00
parent 557f9f17ae
commit 7f1035a537
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
View File

@ -15,7 +15,7 @@ import { FileDropOverlayService } from '@upload-download/services/file-drop-over
import { FileUploadModel } from '@upload-download/model/file-upload.model'; import { FileUploadModel } from '@upload-download/model/file-upload.model';
import { FileUploadService } from '@upload-download/services/file-upload.service'; import { FileUploadService } from '@upload-download/services/file-upload.service';
import { StatusOverlayService } from '@upload-download/services/status-overlay.service'; import { StatusOverlayService } from '@upload-download/services/status-overlay.service';
import { Observable, Subscription } from 'rxjs'; import { Observable } from 'rxjs';
import { filter, skip, switchMap, tap } from 'rxjs/operators'; import { filter, skip, switchMap, tap } from 'rxjs/operators';
import { convertFiles, Files, handleFileDrop } from '@utils/index'; import { convertFiles, Files, handleFileDrop } from '@utils/index';
import { import {
@ -37,7 +37,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { PermissionsService } from '@services/permissions.service'; import { PermissionsService } from '@services/permissions.service';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { FileAttributesService } from '@services/entity-services/file-attributes.service';
import { ConfigService as AppConfigService } from '@services/config.service';
import { ConfigService } from '../config.service'; import { ConfigService } from '../config.service';
import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossiersService } from '@services/entity-services/dossiers.service';
import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
@ -45,7 +44,6 @@ import { LongPressEvent } from '@shared/directives/long-press.directive';
import { UserPreferenceService } from '@services/user-preference.service'; import { UserPreferenceService } from '@services/user-preference.service';
import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesMapService } from '@services/entity-services/files-map.service';
import { FilesService } from '@services/entity-services/files.service'; import { FilesService } from '@services/entity-services/files.service';
import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
@Component({ @Component({
templateUrl: './dossier-overview-screen.component.html', templateUrl: './dossier-overview-screen.component.html',
@ -74,28 +72,25 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
@ViewChild('fileInput', { static: true }) private readonly _fileInput: ElementRef; @ViewChild('fileInput', { static: true }) private readonly _fileInput: ElementRef;
@ViewChild(TableComponent) private readonly _tableComponent: TableComponent<Dossier>; @ViewChild(TableComponent) private readonly _tableComponent: TableComponent<Dossier>;
private _fileAttributeConfigs: IFileAttributeConfig[]; private _fileAttributeConfigs: IFileAttributeConfig[];
private readonly _removableSubscriptions = new Subscription();
constructor( constructor(
protected readonly _injector: Injector, protected readonly _injector: Injector,
private readonly _router: Router, private readonly _router: Router,
readonly permissionsService: PermissionsService,
private readonly _loadingService: LoadingService, private readonly _loadingService: LoadingService,
private readonly _dossiersService: DossiersService, private readonly _dossiersService: DossiersService,
private readonly _dossierStatsService: DossierStatsService,
private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dossierTemplatesService: DossierTemplatesService,
private readonly _appConfigService: AppConfigService,
private readonly _fileUploadService: FileUploadService, private readonly _fileUploadService: FileUploadService,
private readonly _filesService: FilesService, private readonly _filesService: FilesService,
private readonly _statusOverlayService: StatusOverlayService, private readonly _statusOverlayService: StatusOverlayService,
private readonly _fileDropOverlayService: FileDropOverlayService, private readonly _fileDropOverlayService: FileDropOverlayService,
private readonly _dossierAttributesService: DossierAttributesService, private readonly _dossierAttributesService: DossierAttributesService,
private readonly _fileAttributesService: FileAttributesService, private readonly _fileAttributesService: FileAttributesService,
readonly configService: ConfigService,
private readonly _userPreferenceService: UserPreferenceService, private readonly _userPreferenceService: UserPreferenceService,
private readonly _fileMapService: FilesMapService, private readonly _fileMapService: FilesMapService,
private readonly _errorService: ErrorService, private readonly _errorService: ErrorService,
activatedRoute: ActivatedRoute, readonly permissionsService: PermissionsService,
readonly configService: ConfigService,
readonly activatedRoute: ActivatedRoute,
) { ) {
super(_injector); super(_injector);
this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
@ -121,6 +116,8 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
async ngOnInit(): Promise<void> { async ngOnInit(): Promise<void> {
this._loadEntitiesFromState(); this._loadEntitiesFromState();
this._setRemovableSubscriptions();
this.addSubscription = this._fileMapService this.addSubscription = this._fileMapService
.get$(this.dossierId) .get$(this.dossierId)
.pipe( .pipe(
@ -194,12 +191,10 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
} }
private _setRemovableSubscriptions(): void { private _setRemovableSubscriptions(): void {
this._removableSubscriptions.add( this.addActiveScreenSubscription = this._dossiersService
this._dossiersService .getEntityDeleted$(this.dossierId)
.getEntityDeleted$(this.dossierId) .pipe(tap(() => this._handleDeletedDossier()))
.pipe(tap(() => this._handleDeletedDossier())) .subscribe();
.subscribe(),
);
} }
private _handleDeletedDossier(): void { private _handleDeletedDossier(): void {