diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts index 8f12cc5b9..7e382b21d 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts @@ -12,7 +12,7 @@ import { PermissionsService } from '@services/permissions.service'; class DialogData { mode: 'approver' | 'reviewer'; - dossier?: Dossier; + dossierId: string; files?: File[]; ignoreChanged?: boolean; } @@ -24,6 +24,7 @@ class DialogData { export class AssignReviewerApproverDialogComponent { usersForm: FormGroup; searchForm: FormGroup; + readonly dossier: Dossier | undefined; constructor( readonly userService: UserService, @@ -36,6 +37,7 @@ export class AssignReviewerApproverDialogComponent { private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: DialogData, ) { + this.dossier = this._dossiersService.find(data.dossierId); this._loadData(); } @@ -46,8 +48,8 @@ export class AssignReviewerApproverDialogComponent { get singleUsersSelectOptions() { const unassignUser = this._canUnassignFiles ? [undefined] : []; return this.data.mode === 'approver' - ? [...this._dossiersService.activeDossier.approverIds, ...unassignUser] - : [...this._dossiersService.activeDossier.memberIds, ...unassignUser]; + ? [...this.dossier.approverIds, ...unassignUser] + : [...this.dossier.memberIds, ...unassignUser]; } get changed(): boolean { @@ -80,7 +82,7 @@ export class AssignReviewerApproverDialogComponent { await this._filesService .setReviewerFor( this.data.files.map(f => f.fileId), - this._dossiersService.activeDossierId, + this.data.dossierId, selectedUser, ) .toPromise(); @@ -88,7 +90,7 @@ export class AssignReviewerApproverDialogComponent { await this._filesService .setUnderApprovalFor( this.data.files.map(f => f.fileId), - this._dossiersService.activeDossierId, + this.data.dossierId, selectedUser, ) .toPromise(); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 80d5ce762..7a11dd725 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -41,7 +41,7 @@ export class EditDossierDialogComponent { private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) private readonly _data: { - dossier: Dossier; + dossierId: string; afterSave: Function; section?: Section; }, @@ -77,7 +77,7 @@ export class EditDossierDialogComponent { }, ]; - this.dossier = _data.dossier; + this.dossier = this._dossiersService.find(_data.dossierId); this.activeNav = _data.section || 'dossierInfo'; } @@ -111,7 +111,7 @@ export class EditDossierDialogComponent { updatedDossier() { this._toaster.success(_('edit-dossier-dialog.change-successful'), { params: { dossierName: this.dossier.dossierName } }); this.dossier = this._dossiersService.find(this.dossier.id); - this._changeRef.detectChanges(); + this._changeRef.markForCheck(); this.afterSave(); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 0abb33ec4..463781593 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -1,76 +1,65 @@ - -
- - {{ 'dossier-overview.dossier-details.stats.documents' | translate: { count: dossier.files.length } }} -
-
- - {{ 'dossier-overview.dossier-details.stats.people' | translate: { count: dossier.memberIds.length } }} -
-
- - {{ - 'dossier-overview.dossier-details.stats.analysed-pages' | translate: { count: dossier.totalNumberOfPages | number } - }} -
-
- - {{ - 'dossier-overview.dossier-details.stats.created-on' - | translate - : { - date: dossier.date | date: 'd MMM. yyyy' - } - }} - -
-
- - {{ - 'dossier-overview.dossier-details.stats.due-date' - | translate - : { - date: dossier.dueDate | date: 'd MMM. yyyy' - } - }} -
-
- - {{ dossierTemplate(dossier).name }} -
-
- - {{ 'dossier-overview.dossier-details.dictionary' | translate }} -
-
- - {{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: deletedFilesCount$ | async } }} +
+ + {{ 'dossier-overview.dossier-details.stats.documents' | translate: { count: dossier.files.length } }} +
+ +
+ + {{ 'dossier-overview.dossier-details.stats.people' | translate: { count: dossier.memberIds.length } }} +
+ +
+ + {{ 'dossier-overview.dossier-details.stats.analysed-pages' | translate: { count: dossier.totalNumberOfPages | number } }} +
+ +
+ + {{ 'dossier-overview.dossier-details.stats.created-on' | translate: { date: date } }} +
+ +
+ + {{ 'dossier-overview.dossier-details.stats.due-date' | translate: { date: dueDate } }} +
+ +
+ + {{ dossierTemplate(dossier).name }} +
+ +
+ + {{ 'dossier-overview.dossier-details.dictionary' | translate }} +
+ +
+ + {{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: deletedFilesCount$ | async } }} +
+ + +
+ {{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }}
- -
- {{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }} + +
+ + {{ attr.label + ': -' }} + {{ attr.label + ': ' + (attr.value | date: 'd MMM. yyyy') }} + + {{ attr.label + ': ' + ('dossier-overview.dossier-details.attributes.image-uploaded' | translate) }} + {{ attr.label + ': ' + attr.value }}
- -
- - {{ attr.label + ': -' }} - {{ attr.label + ': ' + (attr.value | date: 'd MMM. yyyy') }} - - {{ attr.label + ': ' + ('dossier-overview.dossier-details.attributes.image-uploaded' | translate) }} - {{ attr.label + ': ' + attr.value }} -
- -
- {{ 'dossier-overview.dossier-details.attributes.show-less' | translate }} -
- +
+ {{ 'dossier-overview.dossier-details.attributes.show-less' | translate }} +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index c09b132df..1ad524f4c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -1,33 +1,36 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { AppStateService } from '@state/app-state.service'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Dossier, DossierAttributeWithValue, DossierTemplate } from '@red/domain'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { FilesService } from '@services/entity-services/files.service'; import { Observable } from 'rxjs'; -import { distinctUntilChanged, map, switchMap } from 'rxjs/operators'; +import { distinctUntilChanged, map } from 'rxjs/operators'; @Component({ selector: 'redaction-dossier-details-stats', templateUrl: './dossier-details-stats.component.html', styleUrls: ['./dossier-details-stats.component.scss'], }) -export class DossierDetailsStatsComponent { +export class DossierDetailsStatsComponent implements OnInit { attributesExpanded = false; deletedFilesCount$: Observable; - @Input() dossierAttributes: DossierAttributeWithValue[]; - @Output() readonly openDossierDictionaryDialog = new EventEmitter(); + @Input() + dossierAttributes: DossierAttributeWithValue[]; + @Input() + dossier: Dossier; + @Output() + readonly openDossierDictionaryDialog = new EventEmitter(); constructor( - private readonly _appStateService: AppStateService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: DossiersDialogService, private readonly _filesService: FilesService, readonly dossiersService: DossiersService, - ) { - this.deletedFilesCount$ = dossiersService.activeDossier$.pipe( - switchMap(dossier => _filesService.getDeletedFilesFor(dossier.id)), + ) {} + + ngOnInit() { + this.deletedFilesCount$ = this._filesService.getDeletedFilesFor(this.dossier.id).pipe( map(files => files.length), distinctUntilChanged(), ); @@ -37,9 +40,9 @@ export class DossierDetailsStatsComponent { return this._dossierTemplatesService.find(dossier.dossierTemplateId); } - openEditDossierAttributesDialog(dossier: Dossier, section: string) { + openEditDossierAttributesDialog(dossierId: string, section: string) { this._dialogService.openDialog('editDossier', null, { - dossier, + dossierId, section: section, }); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html index d47576b64..95bad51d7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html @@ -1,4 +1,4 @@ - +
@@ -15,7 +15,7 @@
- +
@@ -69,16 +70,16 @@
{{ description }}
- - - - + + + + ; constructor( readonly appStateService: AppStateService, @@ -38,43 +40,39 @@ export class DossierDetailsComponent implements OnInit { private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _userService: UserService, private readonly _toaster: Toaster, - ) {} + activatedRoute: ActivatedRoute, + ) { + this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); + this.dossier$ = this.dossiersService.getEntityChanged$(this.dossierId); + // this.documentsChartData$ = this.dossier$.pipe( + // switchMap(dossier => dossier.stats$), + // map(stats => this._calculateChartConfig(stats.fileCountPerWorkflowStatus)), + // ); + } get managers() { return this._userService.managerUsers; } - ngOnInit(): void { - this.owner = this._userService.find(this.dossiersService.activeDossier.ownerId); - } - - calculateChartConfig(): void { - const activeDossier = this.dossiersService.activeDossier; - if (!activeDossier) { - return; - } - - const groups = groupBy(activeDossier?.files, 'status'); - let documentsChartData: DoughnutChartConfig[] = Object.keys(groups).map(status => ({ + calculateChartConfig(dossier: Dossier): DoughnutChartConfig[] { + const groups = groupBy(dossier?.files, 'status'); + const documentsChartData: DoughnutChartConfig[] = Object.keys(groups).map(status => ({ value: groups[status].length, color: status, label: fileStatusTranslations[status], key: status, })); documentsChartData.sort((a, b) => StatusSorter.byStatus(a.key, b.key)); - documentsChartData = this.translateChartService.translateStatus(documentsChartData); - this.documentsChartData = documentsChartData; - this._changeDetectorRef.detectChanges(); + return this.translateChartService.translateStatus(documentsChartData); } - async assignOwner(user: User | string) { - this.owner = typeof user === 'string' ? this._userService.find(user) : user; - const activeDossier = this.dossiersService.activeDossier; - const dossierRequest: IDossierRequest = { ...activeDossier, dossierId: activeDossier.dossierId, ownerId: this.owner.id }; + async assignOwner(user: User | string, dossier: Dossier) { + const owner = typeof user === 'string' ? this._userService.find(user) : user; + const dossierRequest: IDossierRequest = { ...dossier, ownerId: owner.id }; await this.dossiersService.createOrUpdate(dossierRequest).toPromise(); - const ownerName = this._userService.getNameForId(this.owner.id); - const dossierName = activeDossier.dossierName; + const ownerName = this._userService.getNameForId(owner.id); + const dossierName = dossier.dossierName; this._toaster.info(_('assignment.owner'), { params: { ownerName, dossierName } }); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts index 63001ca7e..dcdafc357 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts @@ -1,8 +1,10 @@ import { Injectable, TemplateRef } from '@angular/core'; import { + ActionConfig, IFilterGroup, INestedFilter, keyChecker, + List, ListingMode, ListingModes, LoadingService, @@ -41,11 +43,11 @@ export class ConfigService { private readonly _appConfigService: AppConfigService, ) {} - get actionConfig() { + actionConfig(dossierId: string): List { return [ { label: this._translateService.instant('dossier-overview.header-actions.edit'), - action: $event => this._openEditDossierDialog($event), + action: $event => this._openEditDossierDialog($event, dossierId), icon: 'iqser:edit', hide: !this._userService.currentUser.isManager, }, @@ -341,10 +343,8 @@ export class ConfigService { ].map(filter => new NestedFilter(filter)); } - private _openEditDossierDialog($event: MouseEvent) { - this._dialogService.openDialog('editDossier', $event, { - dossier: this._dossiersService.activeDossier, - }); + private _openEditDossierDialog($event: MouseEvent, dossierId: string) { + this._dialogService.openDialog('editDossier', $event, { dossierId }); } private _unassignFn = (reloadDossiers: () => Promise) => async (file: File) => { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html index 1f173e733..8b87b7aa1 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html @@ -1,91 +1,100 @@ -
- - + +
+ + - + - + - - + + -
+
-
-
- +
+
+ - + +
+ +
+ +
+
-
- -
-
- + + + + @@ -93,13 +102,6 @@ - - - -
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index 45a43391c..6850fd340 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -17,12 +17,10 @@ import { FileDropOverlayService } from '@upload-download/services/file-drop-over import { FileUploadModel } from '@upload-download/model/file-upload.model'; import { FileUploadService } from '@upload-download/services/file-upload.service'; import { StatusOverlayService } from '@upload-download/services/status-overlay.service'; -import { TranslateService } from '@ngx-translate/core'; import * as moment from 'moment'; -import { DossierDetailsComponent } from '../components/dossier-details/dossier-details.component'; import { UserService } from '@services/user.service'; -import { timer } from 'rxjs'; -import { take, tap } from 'rxjs/operators'; +import { Observable, timer } from 'rxjs'; +import { take, tap, withLatestFrom } from 'rxjs/operators'; import { convertFiles, Files, handleFileDrop } from '@utils/index'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { @@ -44,7 +42,7 @@ import { DossierAttributesService } from '@shared/services/controller-wrappers/d import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { PermissionsService } from '@services/permissions.service'; import { RouterHistoryService } from '@services/router-history.service'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { ConfigService as AppConfigService } from '@services/config.service'; import { ConfigService } from '../config.service'; @@ -66,7 +64,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple readonly currentUser = this._userService.currentUser; readonly tableHeaderLabel = _('dossier-overview.table-header.title'); - currentDossier = this._dossiersService.activeDossier; collapsedDetails = false; dossierAttributes: DossierAttributeWithValue[] = []; tableColumnConfigs: readonly TableColumnConfig[]; @@ -74,8 +71,10 @@ export class DossierOverviewScreenComponent extends ListingComponent imple displayedInFileListAttributes: IFileAttributeConfig[] = []; displayedAttributes: IFileAttributeConfig[] = []; readonly workflowConfig: WorkflowConfig = this._configService.workflowConfig(() => this.reloadDossiers()); - readonly actionConfigs: readonly ActionConfig[] = this._configService.actionConfig; - @ViewChild(DossierDetailsComponent, { static: false }) private readonly _dossierDetailsComponent: DossierDetailsComponent; + readonly actionConfigs: readonly ActionConfig[]; + readonly dossier$: Observable; + readonly dossierId: string; + currentDossier: Dossier; private _lastScrolledIndex: number; @ViewChild('needsWorkFilterTemplate', { read: TemplateRef, static: true }) private readonly _needsWorkFilterTemplate: TemplateRef; @@ -94,7 +93,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple private readonly _dossierTemplatesService: DossierTemplatesService, readonly routerHistoryService: RouterHistoryService, private readonly _appConfigService: AppConfigService, - private readonly _translateService: TranslateService, private readonly _dialogService: DossiersDialogService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _fileUploadService: FileUploadService, @@ -104,8 +102,13 @@ export class DossierOverviewScreenComponent extends ListingComponent imple private readonly _fileAttributesService: FileAttributesService, private readonly _configService: ConfigService, private readonly _userPreferenceService: UserPreferenceService, + activatedRoute: ActivatedRoute, ) { super(_injector); + this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId'); + this.actionConfigs = this._configService.actionConfig(this.dossierId); + this.dossier$ = this._dossiersService.getEntityChanged$(this.dossierId); + this.currentDossier = this._dossiersService.find(this.dossierId); } private _fileAttributeConfigs: IFileAttributeConfig[]; @@ -219,20 +222,20 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } calculateData(): void { - if (!this._dossiersService.activeDossierId) { + if (!this.dossierId) { return; } this._loadEntitiesFromState(); this._computeAllFilters(); - this._dossierDetailsComponent?.calculateChartConfig(); - this._changeDetectorRef.detectChanges(); + this._changeDetectorRef.markForCheck(); } @HostListener('drop', ['$event']) onDrop(event: DragEvent): void { - handleFileDrop(event, this.currentDossier, this._uploadFiles.bind(this)); + const currentDossier = this._dossiersService.find(this.dossierId); + handleFileDrop(event, currentDossier, this._uploadFiles.bind(this)); } @HostListener('dragover', ['$event']) @@ -242,8 +245,8 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } exportFilesAsCSV() { - this.sortedDisplayedEntities$.pipe(take(1)).subscribe(entities => { - const fileName = this._dossiersService.activeDossier.dossierName + '.export.csv'; + this.sortedDisplayedEntities$.pipe(take(1), withLatestFrom(this.dossier$)).subscribe(([entities, dossier]) => { + const fileName = dossier.dossierName + '.export.csv'; saveAsCSV( fileName, entities, @@ -279,12 +282,12 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } openAssignDossierMembersDialog(): void { - const data = { dossier: this.currentDossier, section: 'members' }; + const data = { dossierId: this.dossierId, section: 'members' }; this._dialogService.openDialog('editDossier', null, data, async () => this.reloadDossiers()); } openDossierDictionaryDialog() { - const data = { dossier: this.currentDossier, section: 'dossierDictionary' }; + const data = { dossierId: this.dossierId, section: 'dossierDictionary' }; this._dialogService.openDialog('editDossier', null, data, async () => { await this.reloadDossiers(); }); @@ -298,7 +301,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple moment(file.lastUpdated).add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS, 'hours').isAfter(moment()); private _loadEntitiesFromState() { - this.currentDossier = this._dossiersService.activeDossier; + this.currentDossier = this._dossiersService.find(this.dossierId); if (this.currentDossier) { this.entitiesService.setEntities([...this.currentDossier.files]); } @@ -312,10 +315,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } private _computeAllFilters() { - if (!this.currentDossier) { - return; - } - const filterGroups = this._configService.filterGroups( this.entitiesService.all, this.listingMode, diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 204ab224f..1e253bfff 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -1,7 +1,7 @@ -
+
this.actionPerformed.emit(), }); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts index 4a5321717..50dff12d4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts @@ -38,7 +38,8 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; }) export class DossiersListingScreenComponent extends ListingComponent - implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach { + implements OnInit, AfterViewInit, OnDestroy, OnAttach, OnDetach +{ readonly currentUser = this._userService.currentUser; readonly tableColumnConfigs = this._configService.tableConfig; readonly tableHeaderLabel = _('dossier-listing.table-header.title'); @@ -111,7 +112,7 @@ export class DossiersListingScreenComponent await this._router.navigate([`/main/dossiers/${addResponse.dossier.id}`]); if (addResponse.addMembers) { this._dialogService.openDialog('editDossier', null, { - dossier: addResponse.dossier, + dossierId: addResponse.dossier.dossierId, section: 'members', }); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index 2ef4e5b9b..43cb9adb5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -70,6 +70,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni excludePages = false; @ViewChild(PdfViewerComponent) readonly viewerComponent: PdfViewerComponent; @ViewChild('fileActions') fileActions: FileActionsComponent; + readonly dossierId: string; private _instance: WebViewerInstance; private _lastPage: string; private _reloadFileOnReanalysis = false; @@ -103,6 +104,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private readonly _translateService: TranslateService, ) { super(); + this.dossierId = _activatedRoute.snapshot.paramMap.get('dossierId'); this._loadingService.start(); document.documentElement.addEventListener('fullscreenchange', () => { if (!document.fullscreenElement) { @@ -243,9 +245,9 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni super.ngOnDestroy(); } - async ngOnAttach(previousRoute: ActivatedRouteSnapshot): Promise { + async ngOnAttach(previousRoute: ActivatedRouteSnapshot): Promise { if (!this.appStateService.activeFile.canBeOpened) { - return this.dossiersService.goToActiveDossier(); + return this._router.navigate([this.dossiersService.find(this.dossierId)?.routerLink]); } await this.ngOnInit(); diff --git a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts index 77826af5d..e02e1310d 100644 --- a/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts +++ b/apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.ts @@ -5,6 +5,7 @@ import { OverlayRef } from '@angular/cdk/overlay'; import { StatusOverlayService } from '../services/status-overlay.service'; import { handleFileDrop } from '@utils/file-drop-utils'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'redaction-file-drop', @@ -18,6 +19,7 @@ export class FileDropComponent { private readonly _dossiersService: DossiersService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _statusOverlayService: StatusOverlayService, + private readonly _activatedRoute: ActivatedRoute, ) {} close() { @@ -33,7 +35,9 @@ export class FileDropComponent { @HostListener('drop', ['$event']) onDrop(event: DragEvent) { - handleFileDrop(event, this._dossiersService.activeDossier, this.uploadFiles.bind(this)); + const dossierId = this._activatedRoute.snapshot.paramMap.get('dossierId'); + console.log(dossierId); + handleFileDrop(event, this._dossiersService.find(dossierId), this.uploadFiles.bind(this)); } @HostListener('dragover', ['$event']) @@ -48,6 +52,6 @@ export class FileDropComponent { this._statusOverlayService.openUploadStatusOverlay(); } this._dialogRef.detach(); - this._changeDetectorRef.detectChanges(); + this._changeDetectorRef.markForCheck(); } } diff --git a/apps/red-ui/src/app/state/app-state.guard.ts b/apps/red-ui/src/app/state/app-state.guard.ts index 437bb8cb4..bda1889e8 100644 --- a/apps/red-ui/src/app/state/app-state.guard.ts +++ b/apps/red-ui/src/app/state/app-state.guard.ts @@ -29,7 +29,7 @@ export class AppStateGuard implements CanActivate { } if (this._userService.currentUser.isUser) { - await this._appStateService.loadAllDossiersIfNecessary(); + await this._dossiersService.loadAllIfEmpty(); } const { dossierId, fileId, dossierTemplateId, type } = route.params; diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index c7c2f02ab..42c2d89ec 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -1,4 +1,4 @@ -import { IListable, List } from '@iqser/common-ui'; +import { Entity, List } from '@iqser/common-ui'; import { StatusSorter } from '../shared'; import { FileStatus, FileStatuses } from './types'; import { IFile } from './file'; @@ -12,7 +12,7 @@ const processingStatuses: List = [ FileStatuses.PROCESSING, ] as const; -export class File implements IFile, IListable { +export class File extends Entity implements IFile { readonly added?: string; readonly allManualRedactionsApplied: boolean; readonly analysisDuration?: number; @@ -64,6 +64,7 @@ export class File implements IFile, IListable { readonly canBeOCRed: boolean; constructor(file: IFile, readonly reviewerName: string, fileAttributesConfig?: IFileAttributesConfig) { + super(file); this.added = file.added; this.allManualRedactionsApplied = !!file.allManualRedactionsApplied; this.analysisDuration = file.analysisDuration;