From 84c4a128ef32cd293d2be97ab028fc6142e1908d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 18 Feb 2022 01:53:08 +0200 Subject: [PATCH 01/20] Archive dossier action --- ...firm-archive-dossier-dialog.component.html | 32 ++++++++++++++ ...firm-archive-dossier-dialog.component.scss | 13 ++++++ ...onfirm-archive-dossier-dialog.component.ts | 43 +++++++++++++++++++ .../edit-dossier-general-info.component.html | 10 ++++- .../edit-dossier-general-info.component.ts | 8 +++- .../app/modules/dossier/dossiers.module.ts | 2 + .../services/dossiers-dialog.service.ts | 5 +++ .../src/app/modules/icons/icons.module.ts | 1 + .../entity-services/dossiers.service.ts | 28 +++++++++--- .../src/app/services/permissions.service.ts | 4 ++ apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/en.json | 16 +++++++ .../src/assets/icons/general/archive.svg | 9 ++++ 13 files changed, 166 insertions(+), 9 deletions(-) create mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html create mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss create mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts create mode 100644 apps/red-ui/src/assets/icons/general/archive.svg diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html new file mode 100644 index 000000000..a076d6010 --- /dev/null +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html @@ -0,0 +1,32 @@ +
+
+ +
+
+ + + +
+ +
+
+
+ + + {{ checkbox.label | translate }} + +
+ +
+ +
+
+ +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss new file mode 100644 index 000000000..1cbdb4e5b --- /dev/null +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss @@ -0,0 +1,13 @@ +@use 'variables'; + +.dialog-header { + color: variables.$primary; +} + +mat-checkbox { + width: 100%; + + &:not(:last-of-type) { + margin-bottom: 6px; + } +} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts new file mode 100644 index 000000000..ef3a45175 --- /dev/null +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts @@ -0,0 +1,43 @@ +import { Component, Inject } from '@angular/core'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { LoadingService, Toaster } from '@iqser/common-ui'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { firstValueFrom } from 'rxjs'; +import { Dossier } from '@red/domain'; +import { DossiersService } from '@services/entity-services/dossiers.service'; + +@Component({ + templateUrl: './confirm-archive-dossier-dialog.component.html', + styleUrls: ['./confirm-archive-dossier-dialog.component.scss'], +}) +export class ConfirmArchiveDossierDialogComponent { + readonly checkboxes = [{ value: false, label: _('confirm-archive-dossier.checkbox.documents') }]; + showToast = false; + + constructor( + private readonly _loadingService: LoadingService, + private readonly _dossiersService: DossiersService, + private readonly _toaster: Toaster, + @Inject(MAT_DIALOG_DATA) readonly dossier: Dossier, + readonly dialogRef: MatDialogRef, + ) {} + + get valid() { + return this.checkboxes[0].value; + } + + async archiveDossier() { + if (this.valid) { + this._loadingService.start(); + await firstValueFrom(this._dossiersService.archive([this.dossier])); + this._toaster.success(_('dossier-listing.archive.archive-succeeded'), { params: this.dossier }); + this.dialogRef.close(true); + } else { + this.showToast = true; + } + } + + cancel() { + this.dialogRef.close(); + } +} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index 4d60d4b0f..dc5f3cd46 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -55,7 +55,7 @@
- +
@@ -95,5 +95,13 @@ [type]="iconButtonTypes.dark" icon="iqser:trash" > + +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 622aca251..5f895cdb9 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -148,6 +148,12 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }); } + archiveDossier() { + this._dialogService.openDialog('archiveDossier', null, this.dossier, () => { + this._editDossierDialogRef.close(); + }); + } + #getForm(): FormGroup { return this._formBuilder.group({ dossierName: [this.dossier.dossierName, Validators.required], @@ -167,7 +173,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } #notifyDossierDeleted() { - this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: { dossierName: this.dossier.dossierName } }); + this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: this.dossier }); } #filterInvalidDossierTemplates() { diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index 9fd58b8cb..2ff709a8a 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -25,12 +25,14 @@ import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; import { EditDossierTeamComponent } from './dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; +import { ConfirmArchiveDossierDialogComponent } from './dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; const screens = [SearchScreenComponent]; const dialogs = [ AddDossierDialogComponent, EditDossierDialogComponent, + ConfirmArchiveDossierDialogComponent, ManualAnnotationDialogComponent, ForceAnnotationDialogComponent, RemoveAnnotationsDialogComponent, diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts index ca5aef32e..2f0f150b4 100644 --- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts @@ -11,12 +11,14 @@ import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-d import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; import { ResizeAnnotationDialogComponent } from '../dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; +import { ConfirmArchiveDossierDialogComponent } from '../dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; type DialogType = | 'confirm' | 'documentInfo' | 'editDossier' | 'addDossier' + | 'archiveDossier' | 'assignFile' | 'recategorizeImage' | 'changeLegalBasis' @@ -44,6 +46,9 @@ export class DossiersDialogService extends DialogService { component: AddDossierDialogComponent, dialogConfig: { width: '900px', autoFocus: true }, }, + archiveDossier: { + component: ConfirmArchiveDossierDialogComponent, + }, assignFile: { component: AssignReviewerApproverDialogComponent, dialogConfig: { disableClose: false }, diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts index 7d808ccd7..06fa9e338 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -13,6 +13,7 @@ export class IconsModule { const icons = [ 'ai', 'approved', + 'archive', 'arrow-up', 'assign', 'assign-me', diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 0e48fc9c7..669383561 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -108,19 +108,33 @@ export class DossiersService extends EntitiesService { } delete(dossier: Dossier): Observable { - const updateDossiers = () => { - this.setEntities(this.all.filter(d => d.dossierId !== dossier.dossierId)); - }; const showToast = () => { this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }); return of({}); }; - return super.delete(dossier.dossierId).pipe(tap(updateDossiers), catchError(showToast)); + return super.delete(dossier.dossierId).pipe( + tap(() => this.#removeDossiers([dossier])), + catchError(showToast), + ); + } + + archive(dossiers: Dossier[]): Observable { + const showToast = () => { + this._toaster.error(_('dossier-listing.archive.archive-failed'), { params: dossiers }); + return of({}); + }; + return this._post( + dossiers.map(d => d.id), + 'archived-dossiers/archive', + ).pipe( + tap(() => this.#removeDossiers(dossiers)), + catchError(showToast), + ); } @Validate() restore(@RequiredParam() dossierIds: List): Promise { - return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore')); + return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore').pipe(switchMap(() => this.loadAll()))); } @Validate() @@ -133,6 +147,10 @@ export class DossiersService extends EntitiesService { return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; } + #removeDossiers(dossiers: Dossier[]): void { + this.setEntities(this.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); + } + private _load(id: string, queryParams?: List): Observable { return super._getOne([id], this._defaultModelPath, queryParams).pipe( map(entity => new Dossier(entity)), diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 361e96385..22912c866 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -133,6 +133,10 @@ export class PermissionsService { return dossier.ownerId === this._userService.currentUser.id; } + canArchiveDossier(dossier: IDossier): boolean { + return dossier.ownerId === this._userService.currentUser.id; + } + canEditDossier(dossier: Dossier, user = this._userService.currentUser): boolean { return user.isManager && !!dossier?.ownerId; } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index bf72886ff..4b275311e 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 4facffb34..a1b84ce97 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -408,6 +408,17 @@ } }, "configurations": "Configurations", + "confirm-archive-dossier": { + "archive": "Archive Dossier", + "cancel": "Cancel", + "checkbox": { + "documents": "All documents will be archived and cannot be put back to active" + }, + "details": "Restoring an archived dossier is not possible anymore, once it got archived.", + "title": "Archive {dossierName}", + "toast-error": "Please confirm that you understand the ramifications of your action!", + "warning": "Are you sure you want to archive the dossier?" + }, "confirm-delete-dossier-state": { "cancel": "Cancel", "delete": "Delete only", @@ -678,6 +689,11 @@ }, "dossier-listing": { "add-new": "New Dossier", + "archive": { + "action": "Archive Dossier", + "archive-failed": "Failed to archive dossier {dossierName}!", + "archive-succeeded": "Successfully archived dossier {dossierName}." + }, "delete": { "action": "Delete Dossier", "delete-failed": "Failed to delete dossier: {dossierName}" diff --git a/apps/red-ui/src/assets/icons/general/archive.svg b/apps/red-ui/src/assets/icons/general/archive.svg new file mode 100644 index 000000000..0d4414f55 --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/archive.svg @@ -0,0 +1,9 @@ + + + + + + + + From 3d69d421505f7612023283c5fd0642396e9d5f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Sat, 19 Feb 2022 02:40:33 +0200 Subject: [PATCH 02/20] View archived dossiers list, breadcrumbs WIP --- apps/red-ui/src/app/app-routing.module.ts | 11 ++++ .../base-screen/base-screen.component.ts | 6 +- .../breadcrumbs/breadcrumbs.component.html | 26 ++++++-- .../breadcrumbs/breadcrumbs.component.ts | 6 +- .../src/app/guards/archived-dossiers.guard.ts | 14 +++++ .../src/app/guards/dictionary-exists.guard.ts | 2 +- ...dossier-states-listing-screen.component.ts | 10 +-- .../modules/archive/archive-routing.module.ts | 19 ++++++ .../src/app/modules/archive/archive.module.ts | 18 ++++++ .../table-item/table-item.component.html | 13 ++++ .../table-item/table-item.component.scss} | 0 .../table-item/table-item.component.ts | 28 +++++++++ .../archived-dossiers-screen.component.html | 21 +++++++ .../archived-dossiers-screen.component.scss | 0 .../archived-dossiers-screen.component.ts | 26 ++++++++ .../archive/services/config.service.ts | 16 +++++ ...onfirm-archive-dossier-dialog.component.ts | 5 +- .../dossiers-listing-details.component.ts | 2 +- .../dossiers-listing-status.component.html | 13 ---- .../table-item/table-item.component.html | 2 +- .../dossiers-listing/config.service.ts | 2 +- .../dossiers-listing.module.ts | 4 -- .../dossier-status.component.html | 6 ++ .../dossier-status.component.scss} | 0 .../dossier-status.component.ts} | 13 ++-- ...ssiers-listing-dossier-name.component.html | 2 +- ...ssiers-listing-dossier-name.component.scss | 0 ...dossiers-listing-dossier-name.component.ts | 7 +-- .../src/app/modules/shared/shared.module.ts | 4 ++ .../src/app/services/breadcrumbs.service.ts | 62 +++++++++++++++---- .../archived-dossiers.service.ts | 53 ++++++++++++++++ .../entity-services/dossiers.service.ts | 14 ----- apps/red-ui/src/assets/i18n/en.json | 18 ++++++ .../src/lib/dossiers/dossier.model.ts | 2 + libs/red-domain/src/lib/dossiers/dossier.ts | 1 + .../src/lib/shared/breadcrumb-types.ts | 3 +- 36 files changed, 352 insertions(+), 77 deletions(-) create mode 100644 apps/red-ui/src/app/guards/archived-dossiers.guard.ts create mode 100644 apps/red-ui/src/app/modules/archive/archive-routing.module.ts create mode 100644 apps/red-ui/src/app/modules/archive/archive.module.ts create mode 100644 apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html rename apps/red-ui/src/app/modules/{dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss => archive/components/table-item/table-item.component.scss} (100%) create mode 100644 apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts create mode 100644 apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.html create mode 100644 apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.scss create mode 100644 apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts create mode 100644 apps/red-ui/src/app/modules/archive/services/config.service.ts delete mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html create mode 100644 apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.html rename apps/red-ui/src/app/modules/{dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss => shared/components/dossier-status/dossier-status.component.scss} (100%) rename apps/red-ui/src/app/modules/{dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts => shared/components/dossier-status/dossier-status.component.ts} (57%) rename apps/red-ui/src/app/modules/{dossier/screens/dossiers-listing => shared}/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html (95%) create mode 100644 apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss rename apps/red-ui/src/app/modules/{dossier/screens/dossiers-listing => shared}/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts (79%) create mode 100644 apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 45c892ee1..19618afeb 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -8,6 +8,7 @@ import { NgModule } from '@angular/core'; import { DownloadsListScreenComponent } from '@components/downloads-list-screen/downloads-list-screen.component'; import { DossiersGuard } from '@guards/dossiers.guard'; import { DossierTemplatesGuard } from '@guards/dossier-templates.guard'; +import { ArchivedDossiersGuard } from '@guards/archived-dossiers.guard'; const routes: Routes = [ { @@ -40,6 +41,16 @@ const routes: Routes = [ requiredRoles: ['RED_USER', 'RED_MANAGER'], }, }, + { + path: 'main/archive', + component: BaseScreenComponent, + loadChildren: () => import('./modules/archive/archive.module').then(m => m.ArchiveModule), + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, ArchivedDossiersGuard], + requiredRoles: ['RED_USER', 'RED_MANAGER'], + }, + }, { path: 'main/downloads', component: BaseScreenComponent, diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index b7087c041..d16e358c5 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -19,7 +19,7 @@ interface MenuItem { } const isNavigationStart = event => event instanceof NavigationStart; -const isSearchScreen = url => url.includes('/main/dossiers') && url.includes('/search'); +const isSearchScreen: (url: string) => boolean = url => url.includes('/main/dossiers') && url.includes('/search'); @Component({ templateUrl: './base-screen.component.html', @@ -80,7 +80,7 @@ export class BaseScreenComponent { ) {} private get _hideSearchThisDossier() { - const routerLink = this.breadcrumbsService.breadcrumbs[1]?.routerLink; + const routerLink = this.breadcrumbsService.breadcrumbs[1]?.options?.routerLink; if (!routerLink) { return true; } @@ -99,7 +99,7 @@ export class BaseScreenComponent { } private _searchThisDossier(query: string) { - const routerLink = this.breadcrumbsService.breadcrumbs[1]?.routerLink; + const routerLink = this.breadcrumbsService.breadcrumbs[1]?.options?.routerLink; if (!routerLink) { return this._search(query, []); } diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index 9d0d70f19..4eb851077 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -9,16 +9,34 @@ {{ breadcrumb.name$ | async }} + + + + {{ breadcrumb.name$ | async }} + + + + + {{ option.name$ | async }} + + +
diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts index 9b2256831..bbf75f194 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { BreadcrumbsService } from '@services/breadcrumbs.service'; +import { Breadcrumb, BreadcrumbDisplayType, BreadcrumbsService } from '@services/breadcrumbs.service'; @Component({ selector: 'redaction-breadcrumbs', @@ -9,4 +9,8 @@ import { BreadcrumbsService } from '@services/breadcrumbs.service'; }) export class BreadcrumbsComponent { constructor(readonly breadcrumbsService: BreadcrumbsService) {} + + is(breadcrumb: Breadcrumb, type: BreadcrumbDisplayType): boolean { + return breadcrumb.type === type; + } } diff --git a/apps/red-ui/src/app/guards/archived-dossiers.guard.ts b/apps/red-ui/src/app/guards/archived-dossiers.guard.ts new file mode 100644 index 000000000..dd2577221 --- /dev/null +++ b/apps/red-ui/src/app/guards/archived-dossiers.guard.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { CanActivate } from '@angular/router'; +import { firstValueFrom } from 'rxjs'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; + +@Injectable({ providedIn: 'root' }) +export class ArchivedDossiersGuard implements CanActivate { + constructor(private readonly _archivedDossiersService: ArchivedDossiersService) {} + + async canActivate(): Promise { + await firstValueFrom(this._archivedDossiersService.loadAll()); + return true; + } +} diff --git a/apps/red-ui/src/app/guards/dictionary-exists.guard.ts b/apps/red-ui/src/app/guards/dictionary-exists.guard.ts index f7d07f8d9..4f7377cba 100644 --- a/apps/red-ui/src/app/guards/dictionary-exists.guard.ts +++ b/apps/red-ui/src/app/guards/dictionary-exists.guard.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { DICTIONARY_TYPE, DOSSIER_TEMPLATE_ID } from '@utils/constants'; -import { DictionariesMapService } from '../services/entity-services/dictionaries-map.service'; +import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @Injectable({ providedIn: 'root' }) export class DictionaryExistsGuard implements CanActivate { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index dde759d49..483430a56 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -10,15 +10,15 @@ import { } from '../../../../../../../../libs/common-ui/src'; import { DossierState, IDossierState } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossiersService } from '../../../../services/entity-services/dossiers.service'; -import { DossierStateService } from '../../../../services/entity-services/dossier-state.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; -import { UserService } from '../../../../services/user.service'; +import { UserService } from '@services/user.service'; import { HttpStatusCode } from '@angular/common/http'; import { DoughnutChartConfig } from '../../../shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { ActivatedRoute } from '@angular/router'; -import { DossierTemplatesService } from '../../../../services/entity-services/dossier-templates.service'; +import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; @Component({ templateUrl: './dossier-states-listing-screen.component.html', @@ -32,7 +32,6 @@ import { DossierTemplatesService } from '../../../../services/entity-services/do export class DossierStatesListingScreenComponent extends ListingComponent implements OnInit, OnDestroy { readonly iconButtonTypes = IconButtonTypes; readonly circleButtonTypes = CircleButtonTypes; - readonly #dossierTemplateId: string; readonly currentUser = this._userService.currentUser; readonly tableHeaderLabel = _('dossier-states-listing.table-header.title'); readonly tableColumnConfigs: TableColumnConfig[] = [ @@ -40,6 +39,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent + +
+ +
{{ dossier.archivedTime | date: 'd MMM. yyyy' }}
+ +
+ +
+ +
+ +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss rename to apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.scss diff --git a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts new file mode 100644 index 000000000..96639f6dd --- /dev/null +++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts @@ -0,0 +1,28 @@ +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { Dossier, DossierStats } from '@red/domain'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { switchMap } from 'rxjs/operators'; + +@Component({ + selector: 'redaction-table-item [dossier]', + templateUrl: './table-item.component.html', + styleUrls: ['./table-item.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class TableItemComponent implements OnChanges { + @Input() dossier!: Dossier; + + readonly stats$: Observable; + readonly #ngOnChanges$ = new BehaviorSubject(undefined); + + constructor(readonly dossierStatsService: DossierStatsService) { + this.stats$ = this.#ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId))); + } + + ngOnChanges() { + if (this.dossier) { + this.#ngOnChanges$.next(this.dossier.dossierId); + } + } +} diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.html b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.html new file mode 100644 index 000000000..5786e6f44 --- /dev/null +++ b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.html @@ -0,0 +1,21 @@ +
+ + +
+ +
+
+ +
+
+
+ + + + diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.scss b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts new file mode 100644 index 000000000..011f62a2d --- /dev/null +++ b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts @@ -0,0 +1,26 @@ +import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { ConfigService } from '../../services/config.service'; +import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { Dossier } from '@red/domain'; + +@Component({ + selector: 'redaction-archived-dossiers-screen', + templateUrl: './archived-dossiers-screen.component.html', + styleUrls: ['./archived-dossiers-screen.component.scss'], + providers: [ + ...DefaultListingServicesTmp, + { provide: EntitiesService, useExisting: ArchivedDossiersService }, + { provide: ListingComponent, useExisting: forwardRef(() => ArchivedDossiersScreenComponent) }, + ], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ArchivedDossiersScreenComponent extends ListingComponent { + readonly tableColumnConfigs = this._configService.tableConfig; + readonly tableHeaderLabel = _('archived-dossiers-listing.table-header.title'); + + constructor(protected readonly _injector: Injector, private readonly _configService: ConfigService) { + super(_injector); + } +} diff --git a/apps/red-ui/src/app/modules/archive/services/config.service.ts b/apps/red-ui/src/app/modules/archive/services/config.service.ts new file mode 100644 index 000000000..49c876ccb --- /dev/null +++ b/apps/red-ui/src/app/modules/archive/services/config.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@angular/core'; +import { TableColumnConfig } from '@iqser/common-ui'; +import { Dossier } from '@red/domain'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +@Injectable() +export class ConfigService { + get tableConfig(): TableColumnConfig[] { + return [ + { label: _('archived-dossiers-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' }, + { label: _('archived-dossiers-listing.table-col-names.last-modified'), sortByKey: 'archivedTime' }, + { label: _('archived-dossiers-listing.table-col-names.owner'), class: 'user-column' }, + { label: _('archived-dossiers-listing.table-col-names.dossier-status'), class: 'flex-end', width: '2fr' }, + ]; + } +} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts index ef3a45175..662e261b1 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts @@ -5,6 +5,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom } from 'rxjs'; import { Dossier } from '@red/domain'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; @Component({ templateUrl: './confirm-archive-dossier-dialog.component.html', @@ -17,6 +18,7 @@ export class ConfirmArchiveDossierDialogComponent { constructor( private readonly _loadingService: LoadingService, private readonly _dossiersService: DossiersService, + private readonly _archivedDossiersService: ArchivedDossiersService, private readonly _toaster: Toaster, @Inject(MAT_DIALOG_DATA) readonly dossier: Dossier, readonly dialogRef: MatDialogRef, @@ -29,9 +31,10 @@ export class ConfirmArchiveDossierDialogComponent { async archiveDossier() { if (this.valid) { this._loadingService.start(); - await firstValueFrom(this._dossiersService.archive([this.dossier])); + await firstValueFrom(this._archivedDossiersService.archive([this.dossier])); this._toaster.success(_('dossier-listing.archive.archive-succeeded'), { params: this.dossier }); this.dialogRef.close(true); + this._loadingService.stop(); } else { this.showToast = true; } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 49106327e..8a2997f48 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -8,7 +8,7 @@ import { workflowFileStatusTranslations } from '../../../../translations/file-st import { TranslateChartService } from '@services/translate-chart.service'; import { filter, map, switchMap } from 'rxjs/operators'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; -import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service'; +import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { TranslateService } from '@ngx-translate/core'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html deleted file mode 100644 index 3df7ebc04..000000000 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html +++ /dev/null @@ -1,13 +0,0 @@ - -
-
{{ currentState.name }}
- -
- - - -
-
{{ 'edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate }}
- -
- diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html index 7ad67122e..c83181f57 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html @@ -16,7 +16,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 10a207470..4e54ab5e5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -10,7 +10,7 @@ import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, Reda import { workloadTranslations } from '../../translations/workload-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; -import { DossierStateService } from '../../../../services/entity-services/dossier-state.service'; +import { DossierStateService } from '@services/entity-services/dossier-state.service'; @Injectable() export class ConfigService { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts index 29af016b3..d36444a4d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/dossiers-listing.module.ts @@ -7,12 +7,10 @@ import { RouterModule, Routes } from '@angular/router'; import { DossiersListingActionsComponent } from './components/dossiers-listing-actions/dossiers-listing-actions.component'; import { SharedModule } from '@shared/shared.module'; import { DossiersListingDetailsComponent } from './components/dossiers-listing-details/dossiers-listing-details.component'; -import { DossiersListingDossierNameComponent } from './components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component'; import { ConfigService } from './config.service'; import { TableItemComponent } from './components/table-item/table-item.component'; import { SharedDossiersModule } from '../../shared/shared-dossiers.module'; import { DossierWorkloadColumnComponent } from './components/dossier-workload-column/dossier-workload-column.component'; -import { DossiersListingStatusComponent } from './components/dossiers-listing-status/dossiers-listing-status.component'; import { DossierDocumentsStatusComponent } from './components/dossier-documents-status/dossier-documents-status.component'; const routes: Routes = [ @@ -29,10 +27,8 @@ const routes: Routes = [ DossiersListingScreenComponent, DossiersListingActionsComponent, DossiersListingDetailsComponent, - DossiersListingDossierNameComponent, DossierWorkloadColumnComponent, TableItemComponent, - DossiersListingStatusComponent, DossierDocumentsStatusComponent, ], providers: [ConfigService], diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.html new file mode 100644 index 000000000..f4c5f96bf --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.html @@ -0,0 +1,6 @@ +
+
+ {{ currentState?.name || ('edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate) }} +
+ +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss b/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss rename to apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.ts similarity index 57% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts rename to apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.ts index e3994df3d..7ad21eca7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-status/dossier-status.component.ts @@ -1,15 +1,14 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@angular/core'; -import { Dossier } from '../../../../../../../../../../libs/red-domain/src'; -import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service'; -import { DossierState } from '@red/domain'; +import { Dossier, DossierState } from '@red/domain'; +import { DossierStateService } from '@services/entity-services/dossier-state.service'; @Component({ - selector: 'redaction-dossiers-listing-status', - templateUrl: './dossiers-listing-status.component.html', - styleUrls: ['./dossiers-listing-status.component.scss'], + selector: 'redaction-dossier-status', + templateUrl: './dossier-status.component.html', + styleUrls: ['./dossier-status.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class DossiersListingStatusComponent implements OnInit, OnChanges { +export class DossierStatusComponent implements OnInit, OnChanges { @Input() dossier: Dossier; currentState: DossierState; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html similarity index 95% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html rename to apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html index c12eabe47..dea2c6bfa 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html @@ -9,7 +9,7 @@ -
+
{{ dossierStats.numberOfFiles }} diff --git a/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts similarity index 79% rename from apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts rename to apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts index 30a26f8b5..d4b86aa17 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import * as moment from 'moment'; @@ -17,11 +16,7 @@ export class DossiersListingDossierNameComponent { @Input() dossier: Dossier; @Input() dossierStats: DossierStats; - constructor( - private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _dossierStatsService: DossierStatsService, - private readonly _dossiersService: DossiersService, - ) {} + constructor(private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dossiersService: DossiersService) {} get approachingDueDate(): boolean { return this._dueDateDaysDiff >= 0 && this._dueDateDaysDiff <= DUE_DATE_WARN_DAYS; diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 939fd0eb7..a185ccf62 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -27,6 +27,8 @@ import { TeamMembersComponent } from './components/team-members/team-members.com import { EditorComponent } from './components/editor/editor.component'; import { ExpandableFileActionsComponent } from './components/expandable-file-actions/expandable-file-actions.component'; import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component'; +import { DossierStatusComponent } from '@shared/components/dossier-status/dossier-status.component'; +import { DossiersListingDossierNameComponent } from '@shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component'; const buttons = [FileDownloadBtnComponent, UserButtonComponent]; @@ -43,6 +45,8 @@ const components = [ TeamMembersComponent, ExpandableFileActionsComponent, ProcessingIndicatorComponent, + DossierStatusComponent, + DossiersListingDossierNameComponent, ...buttons, ]; diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index a6a082738..a6491df9a 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -10,12 +10,18 @@ import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions; +export type BreadcrumbDisplayType = 'text' | 'dropdown'; export interface Breadcrumb { readonly name$: Observable; - readonly routerLink?: string[]; - readonly routerLinkActiveOptions?: RouterLinkActiveOptions | undefined; - readonly clamp?: boolean; + readonly type: BreadcrumbDisplayType; + readonly options: { + readonly routerLink?: string[]; + readonly routerLinkActiveOptions?: RouterLinkActiveOptions | undefined; + readonly clamp?: boolean; + readonly options?: Breadcrumb[]; + readonly activeOption?: Breadcrumb; + }; } export type Breadcrumbs = List; @@ -63,7 +69,8 @@ export class BreadcrumbsService { for (const breadcrumb of route.data.breadcrumbs || []) { switch (breadcrumb) { case BreadcrumbTypes.main: - this._addMainBreadcrumb(); + case BreadcrumbTypes.archive: + this._addMainBreadcrumb(breadcrumb as 'main' | 'archive'); break; case BreadcrumbTypes.dossier: this._addDossierBreadcrumb(route); @@ -75,11 +82,34 @@ export class BreadcrumbsService { } } - private _addMainBreadcrumb(): void { - this._append({ + private _addMainBreadcrumb(type: 'main' | 'archive'): void { + const activeDossiers: Breadcrumb = { name$: of(this._translateService.instant('top-bar.navigation-items.dossiers')), - routerLink: ['/main', 'dossiers'], - routerLinkActiveOptions: { exact: true }, + type: 'text' as BreadcrumbDisplayType, + options: { + routerLink: ['/main', 'dossiers'], + routerLinkActiveOptions: { exact: true }, + }, + }; + + const archivedDossiers: Breadcrumb = { + name$: of(this._translateService.instant('top-bar.navigation-items.archived-dossiers')), + type: 'text' as BreadcrumbDisplayType, + options: { + routerLink: ['/main', 'archive'], + routerLinkActiveOptions: { exact: true }, + }, + }; + + const activeOption = type === 'main' ? activeDossiers : archivedDossiers; + + this._append({ + name$: activeOption.name$, + type: 'dropdown' as BreadcrumbDisplayType, + options: { + options: [activeDossiers, archivedDossiers], + activeOption, + }, }); } @@ -87,9 +117,12 @@ export class BreadcrumbsService { const dossierId = route.paramMap.get(DOSSIER_ID); this._append({ name$: this._dossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), - routerLink: ['/main', 'dossiers', dossierId], - routerLinkActiveOptions: { exact: true }, - clamp: true, + type: 'text' as BreadcrumbDisplayType, + options: { + routerLink: ['/main', 'dossiers', dossierId], + routerLinkActiveOptions: { exact: true }, + clamp: true, + }, }); } @@ -98,8 +131,11 @@ export class BreadcrumbsService { const fileId = route.paramMap.get(FILE_ID); this._append({ name$: this._filesMapService.watch$(dossierId, fileId).pipe(pluck('filename')), - routerLink: ['/main', 'dossiers', dossierId, 'file', fileId], - clamp: true, + type: 'text' as BreadcrumbDisplayType, + options: { + routerLink: ['/main', 'dossiers', dossierId, 'file', fileId], + clamp: true, + }, }); } } diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts new file mode 100644 index 000000000..9721d69ab --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts @@ -0,0 +1,53 @@ +import { Injectable, Injector } from '@angular/core'; +import { EntitiesService, mapEach, Toaster } from '@iqser/common-ui'; +import { Dossier, IDossier } from '@red/domain'; +import { catchError, mapTo, switchMap, tap } from 'rxjs/operators'; +import { Observable, of } from 'rxjs'; +import { DossierStateService } from '@services/entity-services/dossier-state.service'; +import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DossiersService } from '@services/entity-services/dossiers.service'; + +@Injectable({ + providedIn: 'root', +}) +export class ArchivedDossiersService extends EntitiesService { + constructor( + protected readonly _injector: Injector, + private readonly _toaster: Toaster, + private readonly _dossierStateService: DossierStateService, + private readonly _dossierStatsService: DossierStatsService, + private readonly _dossiersService: DossiersService, + ) { + super(_injector, Dossier, 'archived-dossiers'); + } + + loadAll(): Observable { + const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); + return this.getAll().pipe( + mapEach(entity => new Dossier(entity)), + /* Load stats before updating entities */ + switchMap(dossiers => this._dossierStatsService.getFor(dossierIds(dossiers)).pipe(mapTo(dossiers))), + switchMap(dossiers => this._dossierStateService.loadAllForAllTemplates().pipe(mapTo(dossiers))), + tap(dossiers => this.setEntities(dossiers)), + ); + } + + archive(dossiers: Dossier[]): Observable { + const showToast = () => { + this._toaster.error(_('dossier-listing.archive.archive-failed'), { params: dossiers }); + return of({}); + }; + return this._post( + dossiers.map(d => d.id), + `${this._defaultModelPath}/archive`, + ).pipe( + tap(() => this.#removeDossiers(dossiers)), + catchError(showToast), + ); + } + + #removeDossiers(dossiers: Dossier[]): void { + this._dossiersService.setEntities(this._dossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); + } +} diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 669383561..2610d479f 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -118,20 +118,6 @@ export class DossiersService extends EntitiesService { ); } - archive(dossiers: Dossier[]): Observable { - const showToast = () => { - this._toaster.error(_('dossier-listing.archive.archive-failed'), { params: dossiers }); - return of({}); - }; - return this._post( - dossiers.map(d => d.id), - 'archived-dossiers/archive', - ).pipe( - tap(() => this.#removeDossiers(dossiers)), - catchError(showToast), - ); - } - @Validate() restore(@RequiredParam() dossierIds: List): Promise { return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore').pipe(switchMap(() => this.loadAll()))); diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index a1b84ce97..ba47d3192 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -313,6 +313,23 @@ "suggestion-resize": "Suggested Resize" }, "annotations": "Annotations", + "archived-dossiers-listing": { + "no-data": { + "title": "No archived dossiers." + }, + "no-match": { + "title": "No archived dossiers match your current filters." + }, + "table-col-names": { + "dossier-status": "Dossier Status", + "last-modified": "Last Modified", + "name": "Name", + "owner": "Owner" + }, + "table-header": { + "title": "{length} Archived {length, plural, one{Dossier} other{Dossiers}}" + } + }, "assign-dossier-owner": { "dialog": { "approvers": "Approvers", @@ -1722,6 +1739,7 @@ }, "top-bar": { "navigation-items": { + "archived-dossiers": "Archived Dossiers", "back": "Back", "dossiers": "Active Dossiers", "my-account": { diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts index e2a79d550..b95caf827 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.model.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts @@ -22,6 +22,7 @@ export class Dossier implements IDossier, IListable { readonly status: DossierStatus; readonly watermarkEnabled: boolean; readonly watermarkPreviewEnabled: boolean; + readonly archivedTime: string; readonly hasReviewers: boolean; constructor(dossier: IDossier) { @@ -43,6 +44,7 @@ export class Dossier implements IDossier, IListable { this.status = dossier.status; this.watermarkEnabled = dossier.watermarkEnabled; this.watermarkPreviewEnabled = dossier.watermarkPreviewEnabled; + this.archivedTime = dossier.archivedTime; this.hasReviewers = !!this.memberIds && this.memberIds.length > 1; } diff --git a/libs/red-domain/src/lib/dossiers/dossier.ts b/libs/red-domain/src/lib/dossiers/dossier.ts index 1ff219033..59689a5d9 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.ts @@ -21,4 +21,5 @@ export interface IDossier { readonly status: DossierStatus; readonly watermarkEnabled: boolean; readonly watermarkPreviewEnabled: boolean; + readonly archivedTime: string; } diff --git a/libs/red-domain/src/lib/shared/breadcrumb-types.ts b/libs/red-domain/src/lib/shared/breadcrumb-types.ts index 3366c25a2..74ed8ae69 100644 --- a/libs/red-domain/src/lib/shared/breadcrumb-types.ts +++ b/libs/red-domain/src/lib/shared/breadcrumb-types.ts @@ -1,7 +1,8 @@ -export type BreadcrumbType = 'main' | 'dossier' | 'file'; +export type BreadcrumbType = 'main' | 'dossier' | 'file' | 'archive'; export const BreadcrumbTypes = { main: 'main' as BreadcrumbType, dossier: 'dossier' as BreadcrumbType, file: 'file' as BreadcrumbType, + archive: 'archive' as BreadcrumbType, }; From 8e54d5284532518ad2ab28dca18b36bf052dd09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 22 Feb 2022 00:56:49 +0200 Subject: [PATCH 03/20] Breadcrumbs --- .../base-screen/base-screen.component.html | 4 +- .../base-screen/base-screen.component.scss | 6 ++ .../breadcrumbs/breadcrumbs.component.html | 8 ++- .../breadcrumbs/breadcrumbs.component.scss | 6 +- .../breadcrumbs/breadcrumbs.component.ts | 5 +- ...ossier-template-breadcrumbs.component.html | 2 +- .../src/app/services/breadcrumbs.service.ts | 65 ++++++++++++------- libs/common-ui | 2 +- 8 files changed, 66 insertions(+), 32 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 106f8e0d7..fe081fb50 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -3,7 +3,7 @@
-
+
@@ -14,7 +14,7 @@
{{ titleService.getTitle() }}
-
+
- - {{ breadcrumb.name$ | async }} - + {{ option.name$ | async }} + diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.scss b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.scss index 59d14c092..d9354978b 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.scss +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.scss @@ -1,10 +1,14 @@ :host { display: flex; align-items: center; - overflow: hidden; + overflow: visible; height: 100%; > .breadcrumbs > *:not(:last-child) { margin-right: 6px; } + + .dropdown-breadcrumb { + margin-left: -16px; + } } diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts index bbf75f194..d6d834733 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.ts @@ -1,11 +1,12 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Component } from '@angular/core'; import { Breadcrumb, BreadcrumbDisplayType, BreadcrumbsService } from '@services/breadcrumbs.service'; +/** Removed on push change detection because [aria-expanded] doesn't seem to work correctly on the dropdown button */ + @Component({ selector: 'redaction-breadcrumbs', templateUrl: './breadcrumbs.component.html', styleUrls: ['./breadcrumbs.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, }) export class BreadcrumbsComponent { constructor(readonly breadcrumbsService: BreadcrumbsService) {} diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index b7c2079b4..05ec77f2f 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -1,4 +1,4 @@ -
+
Date: Tue, 22 Feb 2022 14:25:01 +0200 Subject: [PATCH 04/20] Generic dossiers service --- apps/red-ui/src/app/app-routing.module.ts | 8 +- apps/red-ui/src/app/app.module.ts | 12 +- .../notifications/notifications.component.ts | 4 +- .../src/app/guards/archived-dossiers.guard.ts | 14 -- .../src/app/guards/dossier-files-guard.ts | 4 +- apps/red-ui/src/app/guards/dossiers.guard.ts | 14 +- .../src/app/guards/file-preview.guard.ts | 6 +- ...add-edit-dossier-state-dialog.component.ts | 2 +- ...dd-edit-file-attribute-dialog.component.ts | 2 +- .../confirm-delete-users-dialog.component.ts | 9 +- ...dossier-states-listing-screen.component.ts | 10 +- .../screens/trash/trash-screen.component.ts | 10 +- .../add-dossier-dialog.component.ts | 6 +- ...sign-reviewer-approver-dialog.component.ts | 6 +- .../change-legal-basis-dialog.component.ts | 4 +- ...onfirm-archive-dossier-dialog.component.ts | 4 +- .../document-info-dialog.component.ts | 6 +- .../edit-dossier-dictionary.component.ts | 4 +- ...edit-dossier-download-package.component.ts | 6 +- .../edit-dossier-dialog.component.ts | 18 +-- .../edit-dossier-team.component.ts | 6 +- .../edit-dossier-general-info.component.ts | 8 +- .../force-annotation-dialog.component.ts | 4 +- .../manual-annotation-dialog.component.ts | 6 +- .../dossier-details.component.ts | 8 +- .../file-workload/file-workload.component.ts | 9 +- .../dossier-overview-screen.component.ts | 16 +- .../services/bulk-actions.service.ts | 6 +- .../dossier-documents-status.component.ts | 2 +- .../dossiers-listing-actions.component.ts | 12 +- .../dossiers-listing-details.component.html | 2 +- .../dossiers-listing-details.component.ts | 12 +- .../dossiers-listing-screen.component.ts | 8 +- .../annotation-actions.component.ts | 10 +- .../document-info/document-info.component.ts | 2 +- .../user-management.component.ts | 6 +- .../accept-recommendation-dialog.component.ts | 6 +- .../file-preview-providers.ts | 2 +- .../file-preview-screen.component.ts | 12 +- .../services/annotation-actions.service.ts | 6 +- .../services/annotation-draw.service.ts | 8 +- .../services/file-preview-state.service.ts | 10 +- .../search-screen/search-screen.component.ts | 8 +- .../services/manual-annotation.service.ts | 6 +- .../file-actions/file-actions.component.ts | 18 +-- .../shared/services/file-assign.service.ts | 6 +- .../dictionary-manager.component.html | 2 +- .../dictionary-manager.component.ts | 4 +- ...dossiers-listing-dossier-name.component.ts | 7 +- .../file-drop/file-drop.component.ts | 6 +- .../src/app/services/breadcrumbs.service.ts | 6 +- .../active-dossiers.service.ts | 133 ++++++++++++++++ .../archived-dossiers.service.ts | 36 ++--- .../entity-services/dossiers.service.ts | 148 ++---------------- .../platform-search.service.ts | 8 +- .../src/app/services/notifications.service.ts | 6 +- .../src/app/services/permissions.service.ts | 6 +- apps/red-ui/src/app/tokens.ts | 3 + 58 files changed, 361 insertions(+), 352 deletions(-) delete mode 100644 apps/red-ui/src/app/guards/archived-dossiers.guard.ts create mode 100644 apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 19618afeb..667b37f53 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -6,9 +6,9 @@ import { BaseScreenComponent } from '@components/base-screen/base-screen.compone import { RouteReuseStrategy, RouterModule, Routes } from '@angular/router'; import { NgModule } from '@angular/core'; import { DownloadsListScreenComponent } from '@components/downloads-list-screen/downloads-list-screen.component'; -import { DossiersGuard } from '@guards/dossiers.guard'; import { DossierTemplatesGuard } from '@guards/dossier-templates.guard'; -import { ArchivedDossiersGuard } from '@guards/archived-dossiers.guard'; +import { DossiersGuard } from '@guards/dossiers.guard'; +import { ACTIVE_DOSSIERS_SERVICE, ARCHIVED_DOSSIERS_SERVICE } from './tokens'; const routes: Routes = [ { @@ -39,6 +39,7 @@ const routes: Routes = [ data: { routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, DossiersGuard], requiredRoles: ['RED_USER', 'RED_MANAGER'], + dossiersService: ACTIVE_DOSSIERS_SERVICE, }, }, { @@ -47,8 +48,9 @@ const routes: Routes = [ loadChildren: () => import('./modules/archive/archive.module').then(m => m.ArchiveModule), canActivate: [CompositeRouteGuard], data: { - routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, ArchivedDossiersGuard], + routeGuards: [AuthGuard, RedRoleGuard, DossierTemplatesGuard, DossiersGuard], requiredRoles: ['RED_USER', 'RED_MANAGER'], + dossiersService: ARCHIVED_DOSSIERS_SERVICE, }, }, { diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 460e10808..aab790e5a 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -20,7 +20,7 @@ import { AppRoutingModule } from './app-routing.module'; import { SharedModule } from '@shared/shared.module'; import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; import { PlatformLocation } from '@angular/common'; -import { BASE_HREF } from './tokens'; +import { ACTIVE_DOSSIERS_SERVICE, ARCHIVED_DOSSIERS_SERVICE, BASE_HREF } from './tokens'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { GlobalErrorHandler } from '@utils/global-error-handler.service'; import { REDMissingTranslationHandler } from '@utils/missing-translations-handler'; @@ -44,6 +44,8 @@ import { GeneralSettingsService } from '@services/general-settings.service'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader { return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`); @@ -144,6 +146,14 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp useFactory: (configService: ConfigService) => configService.values.MAX_RETRIES_ON_SERVER_ERROR, deps: [ConfigService], }, + { + provide: ACTIVE_DOSSIERS_SERVICE, + useExisting: ActiveDossiersService, + }, + { + provide: ARCHIVED_DOSSIERS_SERVICE, + useExisting: ArchivedDossiersService, + }, DatePipe, ], bootstrap: [AppComponent], diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index 29b22b627..ac364c677 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { DatePipe } from '@shared/pipes/date.pipe'; import { UserService } from '@services/user.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { NotificationsService } from '@services/notifications.service'; import { Notification } from '@red/domain'; import { distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; @@ -33,7 +33,7 @@ export class NotificationsComponent extends AutoUnsubscribe implements OnInit { private readonly _translateService: TranslateService, private readonly _userService: UserService, private readonly _notificationsService: NotificationsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _datePipe: DatePipe, ) { super(); diff --git a/apps/red-ui/src/app/guards/archived-dossiers.guard.ts b/apps/red-ui/src/app/guards/archived-dossiers.guard.ts deleted file mode 100644 index dd2577221..000000000 --- a/apps/red-ui/src/app/guards/archived-dossiers.guard.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Injectable } from '@angular/core'; -import { CanActivate } from '@angular/router'; -import { firstValueFrom } from 'rxjs'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; - -@Injectable({ providedIn: 'root' }) -export class ArchivedDossiersGuard implements CanActivate { - constructor(private readonly _archivedDossiersService: ArchivedDossiersService) {} - - async canActivate(): Promise { - await firstValueFrom(this._archivedDossiersService.loadAll()); - return true; - } -} diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index 2b5a353b4..d8ecf32fc 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom } from 'rxjs'; @@ -9,7 +9,7 @@ import { DOSSIER_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { constructor( - private readonly _dossiersService: DossiersService, + private readonly _dossiersService: ActiveDossiersService, private readonly _filesMapService: FilesMapService, private readonly _filesService: FilesService, private readonly _router: Router, diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index 7f056bf71..e870a7b04 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,14 +1,16 @@ -import { Injectable } from '@angular/core'; -import { CanActivate } from '@angular/router'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { Injectable, Injector, ProviderToken } from '@angular/core'; +import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; import { firstValueFrom } from 'rxjs'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { - constructor(private readonly _dossiersService: DossiersService) {} + constructor(private readonly _injector: Injector) {} - async canActivate(): Promise { - await firstValueFrom(this._dossiersService.loadAll()); + async canActivate(route: ActivatedRouteSnapshot): Promise { + const token: ProviderToken = route.data.dossiersService; + const dossiersService: DossiersService = this._injector.get(token); + await firstValueFrom(dossiersService.loadAll()); return true; } } diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 6db6c56d3..43feda4ae 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { constructor( private readonly _filesMapService: FilesMapService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _router: Router, ) {} @@ -16,7 +16,7 @@ export class FilePreviewGuard implements CanActivate { const dossierId = route.paramMap.get(DOSSIER_ID); const fileId = route.paramMap.get(FILE_ID); - const dossier = this._dossiersService.find(dossierId); + const dossier = this._activeDossiersService.find(dossierId); if (!this._filesMapService.get(dossierId, fileId)) { await this._router.navigate([dossier.routerLink]); diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts index 0a3ec2ad4..7a5828ea7 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; -import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src'; +import { BaseDialogComponent } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { IDossierState } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index 413cdc418..c1870a01a 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -4,7 +4,7 @@ import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { fileAttributeTypesTranslations } from '../../translations/file-attribute-types-translations'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src'; +import { BaseDialogComponent } from '@iqser/common-ui'; @Component({ selector: 'redaction-add-edit-file-attribute-dialog', diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts index 62cf4cb8b..952f31f18 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts @@ -2,7 +2,7 @@ import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { List, LoadingService } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { UserService } from '@services/user.service'; import { firstValueFrom } from 'rxjs'; @@ -22,7 +22,7 @@ export class ConfirmDeleteUsersDialogComponent { constructor( private readonly _userService: UserService, private readonly _loadingService: LoadingService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, @Inject(MAT_DIALOG_DATA) readonly userIds: List, readonly dialogRef: MatDialogRef, ) { @@ -34,8 +34,9 @@ export class ConfirmDeleteUsersDialogComponent { } private get _dossierCount(): number { - return this._dossiersService.all.filter(dw => this.userIds.reduce((prev, userId) => prev || dw.memberIds.includes(userId), false)) - .length; + return this._activeDossiersService.all.filter(dw => + this.userIds.reduce((prev, userId) => prev || dw.memberIds.includes(userId), false), + ).length; } async deleteUser() { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index 483430a56..d21f9a8a8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -7,10 +7,10 @@ import { LoadingService, TableColumnConfig, Toaster, -} from '../../../../../../../../libs/common-ui/src'; +} from '@iqser/common-ui'; import { DossierState, IDossierState } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; @@ -44,7 +44,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent { this._loadingService.start(); - await firstValueFrom(this._dossiersService.loadAll()); + await firstValueFrom(this._activeDossiersService.loadAll()); try { const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === this.#dossierTemplateId); @@ -121,6 +121,6 @@ export class DossierStatesListingScreenComponent extends ListingComponent (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId))); + dossierStates.forEach(state => (state.dossierCount = this._activeDossiersService.getCountWithState(state.dossierStatusId))); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts index b279502e5..ddb82b7d0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts @@ -12,7 +12,7 @@ import { } from '@iqser/common-ui'; import { ConfigService } from '@services/config.service'; import * as moment from 'moment'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Observable } from 'rxjs'; @@ -50,7 +50,7 @@ export class TrashScreenComponent extends ListingComponent impl protected readonly _injector: Injector, private readonly _loadingService: LoadingService, private readonly _permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, readonly routerHistoryService: RouterHistoryService, private readonly _configService: ConfigService, private readonly _adminDialogService: AdminDialogService, @@ -108,7 +108,7 @@ export class TrashScreenComponent extends ListingComponent impl } private async _loadDossiersData(): Promise { - this.entitiesService.setEntities(this._toListItems(await this._dossiersService.getDeleted()).filter(d => d.canRestore)); + this.entitiesService.setEntities(this._toListItems(await this._activeDossiersService.getDeleted()).filter(d => d.canRestore)); } private _canRestoreDossier(restoreDate: string): boolean { @@ -137,13 +137,13 @@ export class TrashScreenComponent extends ListingComponent impl private async _restore(dossiers: DossierListItem[]): Promise { const dossierIds = dossiers.map(d => d.id); - await this._dossiersService.restore(dossierIds); + await this._activeDossiersService.restore(dossierIds); this._removeFromList(dossierIds); } private async _hardDelete(dossiers: DossierListItem[]) { const dossierIds = dossiers.map(d => d.id); - await this._dossiersService.hardDelete(dossierIds); + await this._activeDossiersService.hardDelete(dossierIds); this._removeFromList(dossierIds); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 7b28b0b7a..5f8df2701 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -5,7 +5,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import * as moment from 'moment'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; import { BaseDialogComponent, IconButtonTypes, SaveOptions } from '@iqser/common-ui'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; import { firstValueFrom } from 'rxjs'; @@ -29,7 +29,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent { availableReportTypes = []; constructor( - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _formBuilder: FormBuilder, private readonly _reportTemplateController: ReportTemplateService, @@ -61,7 +61,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent { reportTemplateValueMapper = (reportTemplate: IReportTemplate) => reportTemplate.templateId; async save(options?: SaveOptions) { - const savedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(this._formToObject())); + const savedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(this._formToObject())); if (savedDossier) { this._dialogRef.close({ dossier: savedDossier, addMembers: options?.addMembers }); } 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 8c41436ea..7c7cab056 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 @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Dossier, File } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; @@ -30,14 +30,14 @@ export class AssignReviewerApproverDialogComponent { readonly userService: UserService, private readonly _toaster: Toaster, private readonly _formBuilder: FormBuilder, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _filesService: FilesService, private readonly _loadingService: LoadingService, readonly permissionsService: PermissionsService, private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: DialogData, ) { - this.dossier = this._dossiersService.find(this.data.files[0].dossierId); + this.dossier = this._activeDossiersService.find(this.data.files[0].dossierId); this.form = this._getForm(); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts index 350bba3e4..379c21e15 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { PermissionsService } from '@services/permissions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; @@ -24,7 +24,7 @@ export class ChangeLegalBasisDialogComponent extends BaseDialogComponent impleme constructor( private readonly _justificationsService: JustificationsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _permissionsService: PermissionsService, private readonly _formBuilder: FormBuilder, protected readonly _injector: Injector, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts index 662e261b1..161eabde6 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts @@ -4,7 +4,7 @@ import { LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom } from 'rxjs'; import { Dossier } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; @Component({ @@ -17,7 +17,7 @@ export class ConfirmArchiveDossierDialogComponent { constructor( private readonly _loadingService: LoadingService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _archivedDossiersService: ArchivedDossiersService, private readonly _toaster: Toaster, @Inject(MAT_DIALOG_DATA) readonly dossier: Dossier, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index b3914d265..6c035d370 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { Dossier, File, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; @@ -19,7 +19,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements private readonly _dossier: Dossier; constructor( - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _formBuilder: FormBuilder, private readonly _fileAttributesService: FileAttributesService, private readonly _filesService: FilesService, @@ -28,7 +28,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements @Inject(MAT_DIALOG_DATA) readonly data: File, ) { super(_injector, _dialogRef); - this._dossier = this._dossiersService.find(this.data.dossierId); + this._dossier = this._activeDossiersService.find(this.data.dossierId); } async ngOnInit() { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 5decb01fc..68a0f725f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -5,7 +5,7 @@ import { PermissionsService } from '@services/permissions.service'; import { DictionaryManagerComponent } from '@shared/components/dictionary-manager/dictionary-manager.component'; import { DictionaryService } from '@shared/services/dictionary.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FormBuilder, FormGroup } from '@angular/forms'; import { firstValueFrom } from 'rxjs'; @@ -27,7 +27,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa @ViewChild(DictionaryManagerComponent, { static: false }) private readonly _dictionaryManager: DictionaryManagerComponent; constructor( - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dictionaryService: DictionaryService, private readonly _permissionsService: PermissionsService, private readonly _loadingService: LoadingService, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index af3b3f7fd..cdbae3661 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -3,7 +3,7 @@ import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup } from '@angular/forms'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { downloadTypesTranslations } from '../../../../../translations/download-types-translations'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; @@ -26,7 +26,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS @Input() dossier: Dossier; constructor( - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _reportTemplateController: ReportTemplateService, private readonly _formBuilder: FormBuilder, private readonly _permissionsService: PermissionsService, @@ -88,7 +88,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS reportTemplateIds: this.form.get('reportTemplateIds').value, }; - const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } 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 1b2cfceed..be9d8491e 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 @@ -10,7 +10,7 @@ import { EditDossierAttributesComponent } from './attributes/edit-dossier-attrib import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { EditDossierDeletedDocumentsComponent } from './deleted-documents/edit-dossier-deleted-documents.component'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component'; @@ -40,7 +40,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A constructor( private readonly _toaster: Toaster, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _changeRef: ChangeDetectorRef, private readonly _loadingService: LoadingService, private readonly _permissionsService: PermissionsService, @@ -85,16 +85,10 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A }, ]; - this.dossier$ = this._dossiersService.getEntityChanged$(_data.dossierId).pipe(tap(dossier => (this._dossier = dossier))); + this.dossier$ = this._activeDossiersService.getEntityChanged$(_data.dossierId).pipe(tap(dossier => (this._dossier = dossier))); this.activeNav = _data.section || 'dossierInfo'; } - ngAfterViewInit() { - if (!this._dossier.ownerId) { - this._toaster.error(_('edit-dossier-dialog.missing-owner')); - } - } - get activeNavItem(): { key: string; title?: string } { return this.navItems.find(item => item.key === this.activeNav); } @@ -137,6 +131,12 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A return this.activeComponent?.disabled; } + ngAfterViewInit() { + if (!this._dossier.ownerId) { + this._toaster.error(_('edit-dossier-dialog.missing-owner')); + } + } + async save(options?: SaveOptions) { this._loadingService.start(); const result = await this.activeComponent.save(); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index aac9f4a28..c1943c05f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { UserService } from '@services/user.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Dossier, IDossierRequest } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; @@ -28,7 +28,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos constructor( readonly userService: UserService, private readonly _formBuilder: FormBuilder, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _permissionsService: PermissionsService, ) { super(); @@ -91,7 +91,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos ownerId: this.selectedOwnerId, } as IDossierRequest; - const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 89395d8e2..9b3f48eee 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -10,7 +10,7 @@ import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; import { ConfirmationDialogInput, IconButtonTypes, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { firstValueFrom } from 'rxjs'; @@ -38,7 +38,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti readonly permissionsService: PermissionsService, private readonly _dossierStateService: DossierStateService, private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dossierStatsService: DossierStatsService, private readonly _formBuilder: FormBuilder, private readonly _dialogService: DossiersDialogService, @@ -120,7 +120,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierStatusId: this.form.get('dossierStatusId').value, } as IDossierRequest; - const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } @@ -139,7 +139,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }, }); this._dialogService.openDialog('confirm', null, data, async () => { - await firstValueFrom(this._dossiersService.delete(this.dossier)); + await firstValueFrom(this._activeDossiersService.delete(this.dossier)); this._editDossierDialogRef.close(); this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted()); }); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts index 5fc82072b..ee322806b 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; import { PermissionsService } from '@services/permissions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier, ILegalBasisChangeRequest } from '@red/domain'; import { firstValueFrom } from 'rxjs'; @@ -28,7 +28,7 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen legalOptions: LegalBasisOption[] = []; constructor( - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _userService: UserService, private readonly _formBuilder: FormBuilder, private readonly _notificationService: Toaster, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index 007009825..cc6f72750 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { ManualAnnotationService } from '../../services/manual-annotation.servic import { PermissionsService } from '@services/permissions.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dictionary, Dossier, IAddRedactionRequest } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; @@ -36,14 +36,14 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme private readonly _justificationsService: JustificationsService, private readonly _manualAnnotationService: ManualAnnotationService, private readonly _permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dictionaryService: DictionaryService, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: { manualRedactionEntryWrapper: ManualRedactionEntryWrapper; dossierId: string }, ) { super(_injector, _dialogRef); - this._dossier = this._dossiersService.find(this.data.dossierId); + this._dossier = this._activeDossiersService.find(this.data.dossierId); this.isDocumentAdmin = this._permissionsService.isApprover(this._dossier); this.isFalsePositiveRequest = this.data.manualRedactionEntryWrapper.type === 'FALSE_POSITIVE'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index c192c12e5..b6ede1e8d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -6,7 +6,7 @@ import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqse import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; @@ -37,7 +37,7 @@ export class DossierDetailsComponent { statusConfig$: Observable; constructor( - readonly dossiersService: DossiersService, + readonly activeDossiersService: ActiveDossiersService, readonly translateChartService: TranslateChartService, readonly filterService: FilterService, private readonly _changeDetectorRef: ChangeDetectorRef, @@ -49,7 +49,7 @@ export class DossierDetailsComponent { activatedRoute: ActivatedRoute, ) { this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossier$ = this.dossiersService.getEntityChanged$(this.dossierId).pipe(shareLast()); + this.dossier$ = this.activeDossiersService.getEntityChanged$(this.dossierId).pipe(shareLast()); this.dossierStats$ = this.dossier$.pipe( pluck('dossierId'), switchMap(dossierId => this._dossierStatsService.watch$(dossierId)), @@ -65,7 +65,7 @@ export class DossierDetailsComponent { 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 firstValueFrom(this.dossiersService.createOrUpdate(dossierRequest)); + await firstValueFrom(this.activeDossiersService.createOrUpdate(dossierRequest)); const ownerName = this._userService.getNameForId(owner.id); const dossierName = dossier.dossierName; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts index 5233d96ad..021efffce 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { File } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { UserService } from '@services/user.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @@ -16,7 +16,7 @@ export class FileWorkloadComponent { constructor( readonly userService: UserService, private readonly _dictionariesMapService: DictionariesMapService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, ) {} get suggestionColor() { @@ -44,6 +44,9 @@ export class FileWorkloadComponent { } private _getDictionaryColor(type: string) { - return this._dictionariesMapService.getDictionaryColor(type, this._dossiersService.find(this.file.dossierId).dossierTemplateId); + return this._dictionariesMapService.getDictionaryColor( + type, + this._activeDossiersService.find(this.file.dossierId).dossierTemplateId, + ); } } 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 00cb0711f..c62cee103 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 @@ -38,7 +38,7 @@ import { PermissionsService } from '@services/permissions.service'; import { ActivatedRoute, Router } from '@angular/router'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { ConfigService } from '../config.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; @@ -78,7 +78,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple protected readonly _injector: Injector, private readonly _router: Router, private readonly _loadingService: LoadingService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _fileUploadService: FileUploadService, private readonly _filesService: FilesService, @@ -95,10 +95,10 @@ export class DossierOverviewScreenComponent extends ListingComponent imple ) { super(_injector); this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossier$ = this._dossiersService + this.dossier$ = this._activeDossiersService .getEntityChanged$(this.dossierId) .pipe(tap(dossier => (this.dossierTemplateId = dossier.dossierTemplateId))); - this.currentDossier = this._dossiersService.find(this.dossierId); + this.currentDossier = this._activeDossiersService.find(this.dossierId); this._updateFileAttributes(); } @@ -133,7 +133,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple this._computeAllFilters(); }); - this.addSubscription = this._dossiersService.dossierFileChanges$ + this.addSubscription = this._activeDossiersService.dossierFileChanges$ .pipe( filter(dossierId => dossierId === this.dossierId), switchMap(dossierId => this._filesService.loadAll(dossierId)), @@ -176,7 +176,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple @HostListener('drop', ['$event']) onDrop(event: DragEvent): void { - const currentDossier = this._dossiersService.find(this.dossierId); + const currentDossier = this._activeDossiersService.find(this.dossierId); handleFileDrop(event, currentDossier, this._uploadFiles.bind(this)); } @@ -192,7 +192,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } private _setRemovableSubscriptions(): void { - this.addActiveScreenSubscription = this._dossiersService + this.addActiveScreenSubscription = this._activeDossiersService .getEntityDeleted$(this.dossierId) .pipe(tap(() => this._handleDeletedDossier())) .subscribe(); @@ -214,7 +214,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } private _loadEntitiesFromState() { - this.currentDossier = this._dossiersService.find(this.dossierId); + this.currentDossier = this._activeDossiersService.find(this.dossierId); this._computeAllFilters(); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index d7bbdd4a5..dfdc3e696 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Dossier, File } from '@red/domain'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { FileAssignService } from '../../../shared/services/file-assign.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -15,7 +15,7 @@ export class BulkActionsService { constructor( private readonly _dialogService: DossiersDialogService, private readonly _loadingService: LoadingService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _filesService: FilesService, private readonly _fileAssignService: FileAssignService, private readonly _reanalysisService: ReanalysisService, @@ -152,7 +152,7 @@ export class BulkActionsService { } private _getDossier(files: File[]): Dossier { - return this._dossiersService.find(files[0].dossierId); + return this._activeDossiersService.find(files[0].dossierId); } private _assignFiles(files: File[], mode: 'reviewer' | 'approver', ignoreChanged = false, withUnassignedOption = false) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts index 00fc9084f..70d9ae838 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { DossierStats, StatusSorter } from '../../../../../../../../../../libs/red-domain/src'; -import { List, StatusBarConfig } from '../../../../../../../../../../libs/common-ui/src'; +import { List, StatusBarConfig } from '@iqser/common-ui'; @Component({ selector: 'redaction-dossier-documents-status', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index 80b56d553..4dae58539 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -8,7 +8,7 @@ import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { ReanalysisService } from '@services/reanalysis.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { firstValueFrom } from 'rxjs'; @Component({ @@ -32,13 +32,17 @@ export class DossiersListingActionsComponent implements OnChanges { constructor( private readonly _reanalysisService: ReanalysisService, private readonly _userService: UserService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, readonly permissionsService: PermissionsService, readonly filesMapService: FilesMapService, private readonly _dialogService: DossiersDialogService, private readonly _userPreferenceService: UserPreferenceService, ) {} + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.VIRTUAL_SCROLL; + } + ngOnChanges() { this.files = this.filesMapService.get(this.dossier.dossierId); this.displayReanalyseBtn = this.permissionsService.displayReanalyseBtn(this.dossier) && this.analysisForced; @@ -56,8 +60,4 @@ export class DossiersListingActionsComponent implements OnChanges { $event.stopPropagation(); await firstValueFrom(this._reanalysisService.reanalyzeDossier(id)); } - - get scrollableParentView(): ScrollableParentView { - return ScrollableParentViews.VIRTUAL_SCROLL; - } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html index 75ad9ceb1..77a4a51e0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.html @@ -7,7 +7,7 @@ [subtitle]="'dossier-listing.stats.charts.dossiers' | translate: { count: config[0].value }" > -
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 8a2997f48..093747465 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { FilterService, mapEach } from '@iqser/common-ui'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { combineLatest, Observable } from 'rxjs'; import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain'; import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; @@ -23,25 +23,25 @@ export class DossiersListingDetailsComponent { constructor( readonly filterService: FilterService, - readonly dossiersService: DossiersService, + readonly activeDossiersService: ActiveDossiersService, private readonly _dossierStatsMap: DossierStatsService, private readonly _translateChartService: TranslateChartService, private readonly _dossierStateService: DossierStateService, private readonly _translateService: TranslateService, ) { - this.documentsChartData$ = this.dossiersService.all$.pipe( + this.documentsChartData$ = this.activeDossiersService.all$.pipe( mapEach(dossier => _dossierStatsMap.watch$(dossier.dossierId)), switchMap(stats$ => combineLatest(stats$)), filter(stats => !stats.some(s => s === undefined)), map(stats => this._toChartData(stats)), ); - this.dossiersChartData$ = this.dossiersService.all$.pipe(switchMap(dossiers => this._toDossierChartData())); + this.dossiersChartData$ = this.activeDossiersService.all$.pipe(switchMap(dossiers => this._toDossierChartData())); } private async _toDossierChartData(): Promise { this._dossierStateService.all.forEach( - state => (state.dossierCount = this.dossiersService.getCountWithState(state.dossierStatusId)), + state => (state.dossierCount = this.activeDossiersService.getCountWithState(state.dossierStatusId)), ); const configArray: DoughnutChartConfig[] = [ ...this._dossierStateService.all @@ -54,7 +54,7 @@ export class DossiersListingDetailsComponent { .values(), ]; - const notAssignedLength = this.dossiersService.all.length - configArray.map(v => v.value).reduce((acc, val) => acc + val, 0); + const notAssignedLength = this.activeDossiersService.all.length - configArray.map(v => v.value).reduce((acc, val) => acc + val, 0); configArray.push({ value: notAssignedLength, label: this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder'), 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 d70a2ae00..c701a66bb 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 @@ -8,7 +8,7 @@ import { DossiersDialogService } from '../../../services/dossiers-dialog.service import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../config.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { tap } from 'rxjs/operators'; @@ -18,7 +18,7 @@ import { tap } from 'rxjs/operators'; styleUrls: ['./dossiers-listing-screen.component.scss'], providers: [ ...DefaultListingServicesTmp, - { provide: EntitiesService, useExisting: DossiersService }, + { provide: EntitiesService, useExisting: ActiveDossiersService }, { provide: ListingComponent, useExisting: forwardRef(() => DossiersListingScreenComponent) }, ], changeDetection: ChangeDetectionStrategy.OnPush, @@ -40,7 +40,7 @@ export class DossiersListingScreenComponent extends ListingComponent im protected readonly _injector: Injector, private readonly _userService: UserService, readonly permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dialogService: DossiersDialogService, private readonly _translateChartService: TranslateChartService, private readonly _configService: ConfigService, @@ -55,7 +55,7 @@ export class DossiersListingScreenComponent extends ListingComponent im } ngOnInit(): void { - this.addSubscription = this._dossiersService.all$.pipe(tap(() => this._computeAllFilters())).subscribe(); + this.addSubscription = this._activeDossiersService.all$.pipe(tap(() => this._computeAllFilters())).subscribe(); } ngOnAttach(): void { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts index fb5dff0c2..4451c3977 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts @@ -8,7 +8,7 @@ import { UserService } from '@services/user.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { MultiSelectService } from '../../services/multi-select.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { HelpModeService, ScrollableParentView, ScrollableParentViews } from '../../../../../../../../../../libs/common-ui/src'; +import { HelpModeService, ScrollableParentView, ScrollableParentViews } from '@iqser/common-ui'; export const AnnotationButtonTypes = { dark: 'dark', @@ -72,6 +72,10 @@ export class AnnotationActionsComponent implements OnChanges { return this.annotations?.length === 1 && this.annotations?.[0].resizing; } + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.ANNOTATIONS_LIST; + } + async ngOnChanges(): Promise { await this._setPermissions(); } @@ -115,10 +119,6 @@ export class AnnotationActionsComponent implements OnChanges { this.annotationActionsService.cancelResize($event, this.viewer, this.annotations[0], this.annotationsChanged); } - get scrollableParentView(): ScrollableParentView { - return ScrollableParentViews.ANNOTATIONS_LIST; - } - private async _setPermissions() { const dossier = await this._state.dossier; this.annotationPermissions = AnnotationPermissions.forUser( diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts index 323443061..2e4dc612d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts @@ -3,7 +3,7 @@ import { DossiersDialogService } from '../../../../services/dossiers-dialog.serv import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DocumentInfoService } from '../../services/document-info.service'; import { combineLatest, Observable, switchMap } from 'rxjs'; -import { PermissionsService } from '../../../../../../services/permissions.service'; +import { PermissionsService } from '@services/permissions.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { map } from 'rxjs/operators'; import { File } from '@red/domain'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts index 075571ce1..91e2c5eee 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts @@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, firstValueFrom, Observable, switchMap } from 'rxjs'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { distinctUntilChanged, map } from 'rxjs/operators'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; @Component({ selector: 'redaction-user-management', @@ -42,9 +42,9 @@ export class UserManagementComponent { readonly loadingService: LoadingService, readonly translateService: TranslateService, readonly stateService: FilePreviewStateService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, ) { - this._dossier$ = this.stateService.file$.pipe(switchMap(file => this._dossiersService.getEntityChanged$(file.dossierId))); + this._dossier$ = this.stateService.file$.pipe(switchMap(file => this._activeDossiersService.getEntityChanged$(file.dossierId))); this.statusBarConfig$ = this.stateService.file$.pipe(map(file => [{ length: 1, color: file.workflowStatus }])); this.assignTooltip$ = this.stateService.file$.pipe( map(file => diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts index 7b513bd5b..73ae1d051 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { PermissionsService } from '@services/permissions.service'; import { Dictionary, Dossier } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { DictionaryService } from '@shared/services/dictionary.service'; import { ManualAnnotationService } from '../../../../services/manual-annotation.service'; @@ -33,14 +33,14 @@ export class AcceptRecommendationDialogComponent extends BaseDialogComponent imp private readonly _formBuilder: FormBuilder, private readonly _manualAnnotationService: ManualAnnotationService, private readonly _permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dictionaryService: DictionaryService, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) readonly data: AcceptRecommendationData, ) { super(_injector, _dialogRef); - this._dossier = this._dossiersService.find(this.data.dossierId); + this._dossier = this._activeDossiersService.find(this.data.dossierId); this.isDocumentAdmin = this._permissionsService.isApprover(this._dossier); this.form = this._getForm(); this.initialFormValue = this.form.getRawValue(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts index 79d5b5720..037a36118 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts @@ -9,7 +9,7 @@ import { AnnotationActionsService } from './services/annotation-actions.service' import { FilePreviewStateService } from './services/file-preview-state.service'; import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; import { AnnotationReferencesService } from './services/annotation-references.service'; -import { FilterService } from '../../../../../../../../libs/common-ui/src'; +import { FilterService } from '@iqser/common-ui'; export const filePreviewScreenProviders = [ FilterService, 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 fc17cf93a..509e9af3e 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 @@ -34,7 +34,7 @@ import { clearStamps, stampPDFPage } from '@utils/page-stamper'; import { TranslateService } from '@ngx-translate/core'; import { handleFilterDelta } from '@utils/filter-utils'; import { FilesService } from '@services/entity-services/files.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; import { FilesMapService } from '@services/entity-services/files-map.service'; @@ -104,7 +104,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private readonly _filterService: FilterService, private readonly _translateService: TranslateService, private readonly _filesMapService: FilesMapService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _reanalysisService: ReanalysisService, private readonly _errorService: ErrorService, private readonly _skippedService: SkippedService, @@ -200,7 +200,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni async ngOnAttach(previousRoute: ActivatedRouteSnapshot): Promise { const file = await this.stateService.file; if (!file.canBeOpened) { - return this._router.navigate([this._dossiersService.find(this.dossierId)?.routerLink]); + return this._router.navigate([this._activeDossiersService.find(this.dossierId)?.routerLink]); } this.viewModeService.compareMode = false; this.viewModeService.switchToStandard(); @@ -487,7 +487,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni await clearStamps(pdfDoc, pdfNet, allPages); if (this.viewModeService.isRedacted) { - const dossier = this._dossiersService.find(this.dossierId); + const dossier = this._activeDossiersService.find(this.dossierId); if (dossier.watermarkPreviewEnabled) { await this._stampPreview(pdfDoc, dossier.dossierTemplateId); } @@ -541,7 +541,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni .pipe(switchMap(() => this._filesService.reload(this.dossierId, this.fileId))) .subscribe(); - this.addActiveScreenSubscription = this._dossiersService + this.addActiveScreenSubscription = this._activeDossiersService .getEntityDeleted$(this.dossierId) .pipe(tap(() => this._handleDeletedDossier())) .subscribe(); @@ -570,7 +570,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private async _loadFileData(file: File): Promise { if (!file || file.isError) { - return this._router.navigate([this._dossiersService.find(this.dossierId).routerLink]); + return this._router.navigate([this._activeDossiersService.find(this.dossierId).routerLink]); } if (file.isUnprocessed) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts index 29b31a0e8..64b334e7e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts @@ -14,7 +14,7 @@ import { Dossier, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IR import { toPosition } from '../../../utils/pdf-calculation.utils'; import { AnnotationDrawService } from './annotation-draw.service'; import { translateQuads } from '@utils/pdf-coordinates'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { AcceptRecommendationData, AcceptRecommendationDialogComponent, @@ -38,12 +38,12 @@ export class AnnotationActionsService { private readonly _dialogService: DossiersDialogService, private readonly _dialog: MatDialog, private readonly _annotationDrawService: AnnotationDrawService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _screenStateService: FilePreviewStateService, ) {} private get _dossier(): Dossier { - return this._dossiersService.find(this._screenStateService.dossierId); + return this._activeDossiersService.find(this._screenStateService.dossierId); } acceptSuggestion($event: MouseEvent, annotations: AnnotationWrapper[], annotationsChanged: EventEmitter) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index 173a752c3..ba68fc852 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -3,7 +3,7 @@ import { Core, WebViewerInstance } from '@pdftron/webviewer'; import { hexToRgb } from '@utils/functions'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { UserPreferenceService } from '@services/user-preference.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { RedactionLogService } from '../../../services/redaction-log.service'; import { environment } from '@environments/environment'; @@ -21,7 +21,7 @@ export class AnnotationDrawService { constructor( private readonly _dictionariesMapService: DictionariesMapService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _redactionLogService: RedactionLogService, private readonly _userPreferenceService: UserPreferenceService, private readonly _skippedService: SkippedService, @@ -128,7 +128,7 @@ export class AnnotationDrawService { } private _computeSection(activeViewer: WebViewerInstance, pageNumber: number, sectionRectangle: ISectionRectangle, dossierId: string) { - const dossierTemplateId = this._dossiersService.find(dossierId).dossierTemplateId; + const dossierTemplateId = this._activeDossiersService.find(dossierId).dossierTemplateId; const rectangleAnnot = new activeViewer.Core.Annotations.RectangleAnnotation(); const pageHeight = activeViewer.Core.documentViewer.getPageHeight(pageNumber); const rectangle: IRectangle = { @@ -156,7 +156,7 @@ export class AnnotationDrawService { compareMode: boolean, ) { const pageNumber = compareMode ? annotationWrapper.pageNumber * 2 - 1 : annotationWrapper.pageNumber; - const dossierTemplateId = this._dossiersService.find(dossierId).dossierTemplateId; + const dossierTemplateId = this._activeDossiersService.find(dossierId).dossierTemplateId; let annotation: Core.Annotations.RectangleAnnotation | Core.Annotations.TextHighlightAnnotation; if (annotationWrapper.rectangle || annotationWrapper.isImage) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index 961597d46..d36846a7f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, firstValueFrom, Observable, pairwise, switchMap } from 'rxjs'; import { FileDataModel } from '@models/file/file-data.model'; import { Dossier, File } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; -import { PermissionsService } from '../../../../../services/permissions.service'; +import { PermissionsService } from '@services/permissions.service'; import { boolFactory, shareLast } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; @@ -27,7 +27,7 @@ export class FilePreviewStateService { readonly #fileData$ = new BehaviorSubject(undefined); constructor( - dossiersService: DossiersService, + activeDossiersService: ActiveDossiersService, filesMapService: FilesMapService, permissionsService: PermissionsService, activatedRoute: ActivatedRoute, @@ -35,9 +35,9 @@ export class FilePreviewStateService { ) { this.fileId = activatedRoute.snapshot.paramMap.get(FILE_ID); this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossierTemplateId = dossiersService.find(this.dossierId).dossierTemplateId; + this.dossierTemplateId = activeDossiersService.find(this.dossierId).dossierTemplateId; - this.dossier$ = dossiersService.getEntityChanged$(this.dossierId); + this.dossier$ = activeDossiersService.getEntityChanged$(this.dossierId); this.file$ = filesMapService.watch$(this.dossierId, this.fileId); [this.isReadonly$, this.isWritable$] = boolFactory(this.file$, file => !permissionsService.canPerformAnnotationActions(file)); diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts index 71a3b1244..c5acc767d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts @@ -17,7 +17,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Dossier, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; @@ -56,7 +56,7 @@ export class SearchScreenComponent extends ListingComponent imp protected readonly _injector: Injector, private readonly _activatedRoute: ActivatedRoute, private readonly _loadingService: LoadingService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, readonly routerHistoryService: RouterHistoryService, private readonly _translateService: TranslateService, private readonly _filesMapService: FilesMapService, @@ -76,7 +76,7 @@ export class SearchScreenComponent extends ListingComponent imp label: this._translateService.instant('search-screen.filters.by-dossier'), filterceptionPlaceholder: this._translateService.instant('search-screen.filters.search-placeholder'), icon: 'red:folder', - filters: this._dossiersService.all.map(dossierToFilter), + filters: this._activeDossiersService.all.map(dossierToFilter), checker: keyChecker('dossierId'), }; this.filterService.addFilterGroups([dossierNameFilter]); @@ -137,7 +137,7 @@ export class SearchScreenComponent extends ListingComponent imp status: file.workflowStatus, assignee: file.assignee, numberOfPages: file.numberOfPages, - dossierName: this._dossiersService.find(dossierId).dossierName, + dossierName: this._activeDossiersService.find(dossierId).dossierName, filename: file.filename, searchKey: score.toString(), routerLink: `/main/dossiers/${dossierId}/file/${fileId}`, diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts index 65085a4d1..e0e7ed10c 100644 --- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts @@ -17,7 +17,7 @@ import { AnnotationActionMode } from '../models/annotation-action-mode.model'; import { annotationActionsTranslations } from '../translations/annotation-actions-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Observable } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @@ -31,7 +31,7 @@ export class ManualAnnotationService extends GenericService private readonly _dictionariesMapService: DictionariesMapService, private readonly _toaster: Toaster, private readonly _permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, protected readonly _injector: Injector, ) { super(_injector, 'manualRedaction'); @@ -371,7 +371,7 @@ export class ManualAnnotationService extends GenericService } private _dossier(dossierId: string): Dossier { - return this._dossiersService.find(dossierId); + return this._activeDossiersService.find(dossierId); } private _getMessage(mode: AnnotationActionMode, modifyDictionary?: boolean, error = false, isConflict = false) { diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index edfe8b159..94f197511 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -28,7 +28,7 @@ import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { FileAssignService } from '../../services/file-assign.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { FilesService } from '@services/entity-services/files.service'; import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service'; @@ -93,7 +93,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, @Optional() private readonly _excludedPagesService: ExcludedPagesService, @Optional() private readonly _documentInfoService: DocumentInfoService, private readonly _permissionsService: PermissionsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _dialogService: DossiersDialogService, private readonly _fileAssignService: FileAssignService, private readonly _loadingService: LoadingService, @@ -255,7 +255,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, } ngOnInit() { - this.addSubscription = this._dossiersService + this.addSubscription = this._activeDossiersService .getEntityChanged$(this.file.dossierId) .pipe(tap(() => this._setup())) .subscribe(); @@ -285,11 +285,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, ); } - private _triggerImportRedactions($event: MouseEvent) { - $event.stopPropagation(); - this.importRedactionsInput.nativeElement.click(); - } - async importRedactions(files: FileList) { const fileToImport = files[0]; @@ -311,6 +306,11 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this._setup(); } + private _triggerImportRedactions($event: MouseEvent) { + $event.stopPropagation(); + this.importRedactionsInput.nativeElement.click(); + } + private _openDeleteFileDialog($event: MouseEvent) { this._dialogService.openDialog( 'confirm', @@ -322,7 +322,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, async () => { this._loadingService.start(); try { - const dossier = this._dossiersService.find(this.file.dossierId); + const dossier = this._activeDossiersService.find(this.file.dossierId); await firstValueFrom(this._fileManagementService.delete([this.file.fileId], this.file.dossierId)); await this._router.navigate([dossier.routerLink]); } catch (error) { diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts index 0694e0588..eac7696a8 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts @@ -5,7 +5,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { firstValueFrom, Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; @@ -15,7 +15,7 @@ export class FileAssignService { private readonly _dialogService: DossiersDialogService, private readonly _userService: UserService, private readonly _filesService: FilesService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _loadingService: LoadingService, private readonly _toaster: Toaster, ) {} @@ -53,7 +53,7 @@ export class FileAssignService { $event?.stopPropagation(); const currentUserId = this._userService.currentUser.id; - const currentDossier = this._dossiersService.find(file.dossierId); + const currentDossier = this._activeDossiersService.find(file.dossierId); const eligibleUsersIds = this._getUserIds(mode, currentDossier); if (file.isNew) { diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html index 8b54d5c02..8050b4264 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html @@ -51,7 +51,7 @@
-
+
{{ selectDossier.dossierName | translate }} diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index 839c80693..c662e3a2c 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -5,7 +5,7 @@ import { catchError, map, take, tap } from 'rxjs/operators'; import { Dictionary, Dossier, DossierTemplate } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@shared/services/dictionary.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { EditorComponent } from '@shared/components/editor/editor.component'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; @@ -47,7 +47,7 @@ export class DictionaryManagerComponent implements OnChanges { constructor( private readonly _dictionaryService: DictionaryService, private readonly _dictionariesMapService: DictionariesMapService, - readonly dossiersService: DossiersService, + readonly activeDossiersService: ActiveDossiersService, readonly dossierTemplatesService: DossierTemplatesService, ) {} diff --git a/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts index d4b86aa17..82789c4dc 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import * as moment from 'moment'; const DUE_DATE_WARN_DAYS = 14; @@ -16,7 +16,10 @@ export class DossiersListingDossierNameComponent { @Input() dossier: Dossier; @Input() dossierStats: DossierStats; - constructor(private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dossiersService: DossiersService) {} + constructor( + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _activeDossiersService: ActiveDossiersService, + ) {} get approachingDueDate(): boolean { return this._dueDateDaysDiff >= 0 && this._dueDateDaysDiff <= DUE_DATE_WARN_DAYS; 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 ca0b84888..856066818 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 @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, HostListener, Inject } from '@angular/cor import { FileUploadService } from '../services/file-upload.service'; import { OverlayRef } from '@angular/cdk/overlay'; import { StatusOverlayService } from '../services/status-overlay.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { handleFileDrop } from '@utils/file-drop-utils'; import { FileUploadModel } from '@upload-download/model/file-upload.model'; import { DOSSIER_ID } from '../../../tokens'; @@ -15,7 +15,7 @@ export class FileDropComponent { constructor( private readonly _dialogRef: OverlayRef, private readonly _fileUploadService: FileUploadService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _statusOverlayService: StatusOverlayService, @Inject(DOSSIER_ID) private readonly _dossierId: string, @@ -34,7 +34,7 @@ export class FileDropComponent { @HostListener('drop', ['$event']) onDrop(event: DragEvent) { - const dossier = this._dossiersService.find(this._dossierId); + const dossier = this._activeDossiersService.find(this._dossierId); handleFileDrop(event, dossier, this.uploadFiles.bind(this)); } diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index e818cb3db..2602d59e5 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -4,7 +4,7 @@ import { ActivatedRouteSnapshot, IsActiveMatchOptions, NavigationEnd, Router } f import { BehaviorSubject, Observable, of } from 'rxjs'; import { filter, pluck } from 'rxjs/operators'; import { FilesMapService } from '@services/entity-services/files-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from './entity-services/active-dossiers.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; @@ -37,7 +37,7 @@ export class BreadcrumbsService { private readonly _router: Router, private readonly _translateService: TranslateService, private readonly _filesMapService: FilesMapService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, ) { this.breadcrumbs$ = this._store$.asObservable(); @@ -137,7 +137,7 @@ export class BreadcrumbsService { private _addDossierBreadcrumb(route: ActivatedRouteSnapshot): void { const dossierId = route.paramMap.get(DOSSIER_ID); this._append({ - name$: this._dossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), + name$: this._activeDossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), type: 'text' as BreadcrumbDisplayType, options: { routerLink: ['/main', 'dossiers', dossierId], diff --git a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts new file mode 100644 index 000000000..0b22e665d --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts @@ -0,0 +1,133 @@ +import { Injectable, Injector } from '@angular/core'; +import { List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; +import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; +import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; +import { firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; +import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; +import { DossiersService } from '@services/entity-services/dossiers.service'; + +export interface IDossiersStats { + totalPeople: number; + totalAnalyzedPages: number; +} + +interface DossierChange { + readonly dossierChanges: boolean; + readonly dossierId: string; + readonly fileChanges: boolean; +} + +type DossierChanges = readonly DossierChange[]; + +interface ChangesDetails { + readonly dossierChanges: DossierChanges; +} + +const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); +const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); + +@Injectable({ + providedIn: 'root', +}) +export class ActiveDossiersService extends DossiersService { + readonly dossierFileChanges$ = new Subject(); + + constructor(private readonly _toaster: Toaster, protected readonly _injector: Injector) { + super(_injector, 'dossier'); + + timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) + .pipe( + switchMap(() => this.loadOnlyChanged()), + tap(changes => this.#emitFileChanges(changes)), + ) + .subscribe(); + } + + loadOnlyChanged(): Observable { + 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( + pluck('dossierChanges'), + switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), + tap(() => this._updateLastChanged()), + ); + } + + hasChangesDetails$(): Observable { + const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; + return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( + filter(changes => changes.dossierChanges.length > 0), + ); + } + + @Validate() + createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { + const showToast = (error: HttpErrorResponse) => { + this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); + return of(undefined); + }; + + return this._post(dossier).pipe( + switchMap(newDossier => this.loadAll().pipe(map(() => this.find(newDossier.dossierId)))), + catchError(showToast), + ); + } + + getDeleted(): Promise { + return firstValueFrom(this.getAll('deleted-dossiers')); + } + + delete(dossier: Dossier): Observable { + const showToast = () => { + this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }); + return of({}); + }; + return super.delete(dossier.dossierId).pipe( + tap(() => this.#removeDossiers([dossier])), + catchError(showToast), + ); + } + + @Validate() + restore(@RequiredParam() dossierIds: List): Promise { + return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore').pipe(switchMap(() => this.loadAll()))); + } + + @Validate() + hardDelete(@RequiredParam() dossierIds: List): Promise { + const body = dossierIds.map(id => ({ key: 'dossierId', value: id })); + return firstValueFrom(super.delete(body, 'deleted-dossiers/hard-delete', body)); + } + + getCountWithState(dossierStatusId: string): number { + return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; + } + + #removeDossiers(dossiers: Dossier[]): void { + this.setEntities(this.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); + } + + private _load(id: string, queryParams?: List): Observable { + return super._getOne([id], this._defaultModelPath, queryParams).pipe( + map(entity => new Dossier(entity)), + tap(dossier => this.replace(dossier)), + switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId])), + ); + } + + #emitFileChanges(dossierChanges: DossierChanges): void { + dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); + } +} diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts index 9721d69ab..50709d769 100644 --- a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts @@ -1,36 +1,20 @@ import { Injectable, Injector } from '@angular/core'; -import { EntitiesService, mapEach, Toaster } from '@iqser/common-ui'; -import { Dossier, IDossier } from '@red/domain'; -import { catchError, mapTo, switchMap, tap } from 'rxjs/operators'; +import { Toaster } from '@iqser/common-ui'; +import { Dossier } from '@red/domain'; +import { catchError, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; -import { DossierStateService } from '@services/entity-services/dossier-state.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { ActiveDossiersService } from './active-dossiers.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; -@Injectable({ - providedIn: 'root', -}) -export class ArchivedDossiersService extends EntitiesService { +@Injectable({ providedIn: 'root' }) +export class ArchivedDossiersService extends DossiersService { constructor( protected readonly _injector: Injector, private readonly _toaster: Toaster, - private readonly _dossierStateService: DossierStateService, - private readonly _dossierStatsService: DossierStatsService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, ) { - super(_injector, Dossier, 'archived-dossiers'); - } - - loadAll(): Observable { - const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); - return this.getAll().pipe( - mapEach(entity => new Dossier(entity)), - /* Load stats before updating entities */ - switchMap(dossiers => this._dossierStatsService.getFor(dossierIds(dossiers)).pipe(mapTo(dossiers))), - switchMap(dossiers => this._dossierStateService.loadAllForAllTemplates().pipe(mapTo(dossiers))), - tap(dossiers => this.setEntities(dossiers)), - ); + super(_injector, 'archived-dossiers'); } archive(dossiers: Dossier[]): Observable { @@ -48,6 +32,8 @@ export class ArchivedDossiersService extends EntitiesService } #removeDossiers(dossiers: Dossier[]): void { - this._dossiersService.setEntities(this._dossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); + this._activeDossiersService.setEntities( + this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)), + ); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 0af4262ff..cd2c67a19 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -1,55 +1,19 @@ -import { Injectable, Injector } from '@angular/core'; -import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; -import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; -import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; -import { combineLatest, firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; -import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; -import { DossierStateService } from '@services/entity-services/dossier-state.service'; +import { EntitiesService, List, mapEach, shareLast } from '@iqser/common-ui'; +import { Dossier, IDossier } from '@red/domain'; +import { combineLatest, Observable } from 'rxjs'; +import { filter, map, mapTo, switchMap, tap } from 'rxjs/operators'; +import { Injector } from '@angular/core'; +import { DossierStateService } from './dossier-state.service'; +import { DossierStatsService } from './dossier-stats.service'; +import { IDossiersStats } from '@services/entity-services/active-dossiers.service'; -export interface IDossiersStats { - totalPeople: number; - totalAnalyzedPages: number; -} - -interface DossierChange { - readonly dossierChanges: boolean; - readonly dossierId: string; - readonly fileChanges: boolean; -} - -type DossierChanges = readonly DossierChange[]; - -interface ChangesDetails { - readonly dossierChanges: DossierChanges; -} - -const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); -const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); - -@Injectable({ - providedIn: 'root', -}) -export class DossiersService extends EntitiesService { +export abstract class DossiersService extends EntitiesService { readonly generalStats$ = this.all$.pipe(switchMap(entities => this.#generalStats$(entities))); - readonly dossierFileChanges$ = new Subject(); + protected readonly _dossierStatsService = this._injector.get(DossierStatsService); + protected readonly _dossierStateService = this._injector.get(DossierStateService); - constructor( - private readonly _toaster: Toaster, - protected readonly _injector: Injector, - private readonly _dossierStatsService: DossierStatsService, - private readonly _dossierStateService: DossierStateService, - ) { - super(_injector, Dossier, 'dossier'); - - timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) - .pipe( - switchMap(() => this.loadOnlyChanged()), - tap(changes => this.#emitFileChanges(changes)), - ) - .subscribe(); + protected constructor(protected readonly _injector: Injector, protected readonly _path: string) { + super(_injector, Dossier, _path); } loadAll(): Observable { @@ -63,92 +27,6 @@ export class DossiersService extends EntitiesService { ); } - loadOnlyChanged(): Observable { - 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( - pluck('dossierChanges'), - switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), - tap(() => this._updateLastChanged()), - ); - } - - hasChangesDetails$(): Observable { - const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; - return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( - filter(changes => changes.dossierChanges.length > 0), - ); - } - - @Validate() - createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { - const showToast = (error: HttpErrorResponse) => { - this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); - return of(undefined); - }; - - return this._post(dossier).pipe( - switchMap(newDossier => this.loadAll().pipe(map(() => this.find(newDossier.dossierId)))), - catchError(showToast), - ); - } - - getDeleted(): Promise { - return firstValueFrom(this.getAll('deleted-dossiers')); - } - - delete(dossier: Dossier): Observable { - const showToast = () => { - this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }); - return of({}); - }; - return super.delete(dossier.dossierId).pipe( - tap(() => this.#removeDossiers([dossier])), - catchError(showToast), - ); - } - - @Validate() - restore(@RequiredParam() dossierIds: List): Promise { - return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore').pipe(switchMap(() => this.loadAll()))); - } - - @Validate() - hardDelete(@RequiredParam() dossierIds: List): Promise { - const body = dossierIds.map(id => ({ key: 'dossierId', value: id })); - return firstValueFrom(super.delete(body, 'deleted-dossiers/hard-delete', body)); - } - - getCountWithState(dossierStatusId: string): number { - return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; - } - - #removeDossiers(dossiers: Dossier[]): void { - this.setEntities(this.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); - } - - private _load(id: string, queryParams?: List): Observable { - return super._getOne([id], this._defaultModelPath, queryParams).pipe( - map(entity => new Dossier(entity)), - tap(dossier => this.replace(dossier)), - switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId])), - ); - } - - #emitFileChanges(dossierChanges: DossierChanges): void { - dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); - } - #computeStats(entities: List): IDossiersStats { let totalAnalyzedPages = 0; const totalPeople = new Set(); diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index 000d563c1..c96e31909 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -3,7 +3,7 @@ import { GenericService } from '@iqser/common-ui'; import { IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; import { Observable, of, zip } from 'rxjs'; import { mapTo, switchMap } from 'rxjs/operators'; -import { DossiersService } from './dossiers.service'; +import { ActiveDossiersService } from './active-dossiers.service'; import { FilesMapService } from './files-map.service'; import { FilesService } from './files.service'; @@ -12,7 +12,7 @@ export class PlatformSearchService extends GenericService { constructor( protected readonly _injector: Injector, private readonly _filesService: FilesService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _filesMapService: FilesMapService, ) { super(_injector, 'search-v2'); @@ -38,7 +38,9 @@ export class PlatformSearchService extends GenericService { } private _loadMissingFiles$(searchResponse: ISearchResponse): Observable { - const documentsOfActiveDossiers = searchResponse.matchedDocuments.filter(document => this._dossiersService.has(document.dossierId)); + const documentsOfActiveDossiers = searchResponse.matchedDocuments.filter(document => + this._activeDossiersService.has(document.dossierId), + ); const fileNotLoaded = ({ dossierId, fileId }: IMatchedDocument) => !this._filesMapService.get(dossierId, fileId); const dossiersWithNotLoadedFiles = documentsOfActiveDossiers.filter(fileNotLoaded).map(document => document.dossierId); diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index 9d798fcb5..a37192934 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -7,7 +7,7 @@ import { INotification, Notification, NotificationTypes } from '@red/domain'; import { map, switchMap } from 'rxjs/operators'; import { notificationsTranslations } from '../translations/notifications-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from './entity-services/active-dossiers.service'; import { UserService } from '@services/user.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; @@ -18,7 +18,7 @@ export class NotificationsService extends GenericService { constructor( protected readonly _injector: Injector, private readonly _translateService: TranslateService, - private readonly _dossiersService: DossiersService, + private readonly _activeDossiersService: ActiveDossiersService, private readonly _userService: UserService, private readonly _filesMapService: FilesMapService, ) { @@ -67,7 +67,7 @@ export class NotificationsService extends GenericService { private _translate(notification: INotification, translation: string): string { const fileId = notification.target.fileId; const dossierId = notification.target.dossierId; - const dossier = this._dossiersService.find(dossierId); + const dossier = this._activeDossiersService.find(dossierId); const files = this._filesMapService.get(dossierId); const file = files?.find(f => f.fileId === fileId); diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 22912c866..257e618c1 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; import { Dossier, File, IComment, IDossier } from '@red/domain'; -import { DossiersService } from './entity-services/dossiers.service'; +import { ActiveDossiersService } from './entity-services/active-dossiers.service'; @Injectable({ providedIn: 'root', }) export class PermissionsService { - constructor(private readonly _userService: UserService, private readonly _dossiersService: DossiersService) {} + constructor(private readonly _userService: UserService, private readonly _activeDossiersService: ActiveDossiersService) {} isReviewerOrApprover(file: File): boolean { const dossier = this._getDossier(file); @@ -228,6 +228,6 @@ export class PermissionsService { } private _getDossier(file: File): Dossier { - return this._dossiersService.find(file.dossierId); + return this._activeDossiersService.find(file.dossierId); } } diff --git a/apps/red-ui/src/app/tokens.ts b/apps/red-ui/src/app/tokens.ts index ca56f808f..ce8f6a595 100644 --- a/apps/red-ui/src/app/tokens.ts +++ b/apps/red-ui/src/app/tokens.ts @@ -2,3 +2,6 @@ import { InjectionToken } from '@angular/core'; export const BASE_HREF: InjectionToken = new InjectionToken('BASE_HREF'); export const DOSSIER_ID: InjectionToken = new InjectionToken('DOSSIER_ID'); + +export const ACTIVE_DOSSIERS_SERVICE = new InjectionToken('Active dossiers service'); +export const ARCHIVED_DOSSIERS_SERVICE = new InjectionToken('Archived dossiers service'); From 0a05eb9a6c18c0f65dd55a1916fb411952b776c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 22 Feb 2022 22:31:31 +0200 Subject: [PATCH 05/20] Archived dossier overview WIP --- .../src/app/guards/dossier-files-guard.ts | 12 +-- .../modules/archive/archive-routing.module.ts | 14 ++++ .../src/app/modules/archive/archive.module.ts | 3 +- .../edit-dossier-dictionary.component.ts | 4 +- ...edit-dossier-download-package.component.ts | 6 +- .../edit-dossier-dialog.component.ts | 6 +- .../edit-dossier-team.component.ts | 6 +- .../edit-dossier-general-info.component.ts | 8 +- .../dossier/dossiers-routing.module.ts | 3 + .../app/modules/dossier/dossiers.module.ts | 34 +------- .../dossier-details.component.ts | 12 +-- .../file-workload/file-workload.component.ts | 10 +-- .../dossier-overview/config.service.ts | 6 +- .../dossier-overview.module.ts | 3 - .../dossier-overview-screen.component.ts | 30 ++++--- .../file-preview-providers.ts | 4 + .../dossier/shared/shared-dossiers.module.ts | 39 +++++++-- .../src/app/services/breadcrumbs.service.ts | 19 +++-- .../active-dossiers.service.ts | 84 ++----------------- .../archived-dossiers.service.ts | 18 ++-- .../dossiers.service.provider.ts | 15 ++++ .../entity-services/dossiers.service.ts | 83 ++++++++++++++++-- .../src/app/services/permissions.service.ts | 22 +++-- .../src/lib/dossiers/dossier.model.ts | 4 +- 24 files changed, 247 insertions(+), 198 deletions(-) create mode 100644 apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index d8ecf32fc..3594a6897 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -1,15 +1,15 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom } from 'rxjs'; import { DOSSIER_ID } from '@utils/constants'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { constructor( - private readonly _dossiersService: ActiveDossiersService, + private readonly _injector: Injector, private readonly _filesMapService: FilesMapService, private readonly _filesService: FilesService, private readonly _router: Router, @@ -17,9 +17,11 @@ export class DossierFilesGuard implements CanActivate { async canActivate(route: ActivatedRouteSnapshot): Promise { const dossierId = route.paramMap.get(DOSSIER_ID); + const token: ProviderToken = route.data.dossiersService; + const dossiersService: DossiersService = this._injector.get(token); - if (!this._dossiersService.has(dossierId)) { - await this._router.navigate(['/main', 'dossiers']); + if (!dossiersService.has(dossierId)) { + await this._router.navigate(['/main', dossiersService.routerPath]); return false; } diff --git a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts index 2f9d6f7f3..36e88ed79 100644 --- a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts @@ -2,6 +2,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { BreadcrumbTypes } from '@red/domain'; import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-screen/archived-dossiers-screen.component'; +import { DOSSIER_ID } from '@utils/constants'; +import { CompositeRouteGuard } from '@iqser/common-ui'; +import { ARCHIVED_DOSSIERS_SERVICE } from '../../tokens'; +import { DossierFilesGuard } from '../../guards/dossier-files-guard'; const routes: Routes = [ { @@ -10,6 +14,16 @@ const routes: Routes = [ component: ArchivedDossiersScreenComponent, data: { breadcrumbs: [BreadcrumbTypes.archive] }, }, + { + path: `:${DOSSIER_ID}`, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [DossierFilesGuard], + breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier], + dossiersService: ARCHIVED_DOSSIERS_SERVICE, + }, + loadChildren: () => import('../dossier/screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), + }, ]; @NgModule({ diff --git a/apps/red-ui/src/app/modules/archive/archive.module.ts b/apps/red-ui/src/app/modules/archive/archive.module.ts index 30b524bb7..a49f1e1b3 100644 --- a/apps/red-ui/src/app/modules/archive/archive.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-screen/archived-dossiers-screen.component'; import { ArchiveRoutingModule } from './archive-routing.module'; -import { CommonUiModule } from '@iqser/common-ui'; import { TableItemComponent } from './components/table-item/table-item.component'; import { ConfigService } from './services/config.service'; import { SharedModule } from '../shared/shared.module'; @@ -12,7 +11,7 @@ const screens = [ArchivedDossiersScreenComponent]; @NgModule({ declarations: [...components, ...screens], - imports: [CommonModule, ArchiveRoutingModule, SharedModule, CommonUiModule], + imports: [CommonModule, ArchiveRoutingModule, SharedModule], providers: [ConfigService], }) export class ArchiveModule {} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 68a0f725f..298bc00af 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -5,10 +5,10 @@ import { PermissionsService } from '@services/permissions.service'; import { DictionaryManagerComponent } from '@shared/components/dictionary-manager/dictionary-manager.component'; import { DictionaryService } from '@shared/services/dictionary.service'; import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FormBuilder, FormGroup } from '@angular/forms'; import { firstValueFrom } from 'rxjs'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-dictionary', @@ -27,7 +27,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa @ViewChild(DictionaryManagerComponent, { static: false }) private readonly _dictionaryManager: DictionaryManagerComponent; constructor( - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _dossiersService: DossiersService, private readonly _dictionaryService: DictionaryService, private readonly _permissionsService: PermissionsService, private readonly _loadingService: LoadingService, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index cdbae3661..ba0ff34b2 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -3,10 +3,10 @@ import { Dossier, DownloadFileType, IReportTemplate } from '@red/domain'; import { FormBuilder, FormGroup } from '@angular/forms'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { downloadTypesTranslations } from '../../../../../translations/download-types-translations'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-download-package', @@ -26,7 +26,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS @Input() dossier: Dossier; constructor( - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _dossiersService: DossiersService, private readonly _reportTemplateController: ReportTemplateService, private readonly _formBuilder: FormBuilder, private readonly _permissionsService: PermissionsService, @@ -88,7 +88,7 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS reportTemplateIds: this.form.get('reportTemplateIds').value, }; - const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } 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 be9d8491e..4322e548d 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 @@ -10,18 +10,20 @@ import { EditDossierAttributesComponent } from './attributes/edit-dossier-attrib import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { EditDossierDeletedDocumentsComponent } from './deleted-documents/edit-dossier-deleted-documents.component'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes' | 'deletedDocuments'; @Component({ templateUrl: './edit-dossier-dialog.component.html', styleUrls: ['./edit-dossier-dialog.component.scss'], + providers: [dossiersServiceProvider], }) export class EditDossierDialogComponent extends BaseDialogComponent implements AfterViewInit { readonly navItems: { key: Section; title?: string; sideNavTitle?: string }[]; @@ -40,7 +42,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A constructor( private readonly _toaster: Toaster, - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _activeDossiersService: DossiersService, private readonly _changeRef: ChangeDetectorRef, private readonly _loadingService: LoadingService, private readonly _permissionsService: PermissionsService, diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index c1943c05f..f51df9547 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { UserService } from '@services/user.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Dossier, IDossierRequest } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { PermissionsService } from '@services/permissions.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-team', @@ -28,7 +28,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos constructor( readonly userService: UserService, private readonly _formBuilder: FormBuilder, - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _dossiersService: DossiersService, private readonly _permissionsService: PermissionsService, ) { super(); @@ -91,7 +91,7 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos ownerId: this.selectedOwnerId, } as IDossierRequest; - const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 9b3f48eee..7bf60d961 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -10,13 +10,13 @@ import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; import { ConfirmationDialogInput, IconButtonTypes, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { firstValueFrom } from 'rxjs'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { TranslateService } from '@ngx-translate/core'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-general-info', @@ -38,7 +38,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti readonly permissionsService: PermissionsService, private readonly _dossierStateService: DossierStateService, private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _dossiersService: DossiersService, private readonly _dossierStatsService: DossierStatsService, private readonly _formBuilder: FormBuilder, private readonly _dialogService: DossiersDialogService, @@ -120,7 +120,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierStatusId: this.form.get('dossierStatusId').value, } as IDossierRequest; - const updatedDossier = await firstValueFrom(this._activeDossiersService.createOrUpdate(dossier)); + const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); return { success: !!updatedDossier }; } @@ -139,7 +139,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }, }); this._dialogService.openDialog('confirm', null, data, async () => { - await firstValueFrom(this._activeDossiersService.delete(this.dossier)); + await firstValueFrom(this._dossiersService.delete(this.dossier)); this._editDossierDialogRef.close(); this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted()); }); diff --git a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts index 58f455fb1..74723fcf3 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts @@ -6,6 +6,7 @@ import { DossierFilesGuard } from '@guards/dossier-files-guard'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; +import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens'; const routes: Routes = [ { @@ -18,6 +19,7 @@ const routes: Routes = [ data: { routeGuards: [DossierFilesGuard], breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier], + dossiersService: ACTIVE_DOSSIERS_SERVICE, }, loadChildren: () => import('./screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), }, @@ -27,6 +29,7 @@ const routes: Routes = [ data: { routeGuards: [DossierFilesGuard, FilePreviewGuard], breadcrumbs: [BreadcrumbTypes.main, BreadcrumbTypes.dossier, BreadcrumbTypes.file], + dossiersService: ACTIVE_DOSSIERS_SERVICE, }, loadChildren: () => import('./screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule), }, diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index 2ff709a8a..d11543139 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -1,65 +1,33 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { AddDossierDialogComponent } from './dialogs/add-dossier-dialog/add-dossier-dialog.component'; -import { AssignReviewerApproverDialogComponent } from './dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; import { ForceAnnotationDialogComponent } from './dialogs/force-redaction-dialog/force-annotation-dialog.component'; import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component'; -import { DocumentInfoDialogComponent } from './dialogs/document-info-dialog/document-info-dialog.component'; import { SharedModule } from '@shared/shared.module'; import { DossiersRoutingModule } from './dossiers-routing.module'; import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; -import { DossiersDialogService } from './services/dossiers-dialog.service'; -import { ManualAnnotationService } from './services/manual-annotation.service'; -import { AnnotationProcessingService } from './services/annotation-processing.service'; -import { EditDossierDialogComponent } from './dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; -import { EditDossierGeneralInfoComponent } from './dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component'; -import { EditDossierDownloadPackageComponent } from './dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component'; -import { EditDossierDictionaryComponent } from './dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component'; import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; -import { EditDossierAttributesComponent } from './dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component'; import { SearchScreenComponent } from './screens/search-screen/search-screen.component'; -import { EditDossierDeletedDocumentsComponent } from './dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; -import { EditDossierTeamComponent } from './dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; -import { ConfirmArchiveDossierDialogComponent } from './dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; const screens = [SearchScreenComponent]; const dialogs = [ - AddDossierDialogComponent, - EditDossierDialogComponent, - ConfirmArchiveDossierDialogComponent, ManualAnnotationDialogComponent, ForceAnnotationDialogComponent, RemoveAnnotationsDialogComponent, ResizeAnnotationDialogComponent, - DocumentInfoDialogComponent, - AssignReviewerApproverDialogComponent, ChangeLegalBasisDialogComponent, RecategorizeImageDialogComponent, ]; -const components = [ - EditDossierGeneralInfoComponent, - EditDossierDownloadPackageComponent, - EditDossierDictionaryComponent, - EditDossierAttributesComponent, - EditDossierTeamComponent, - EditDossierDeletedDocumentsComponent, - - ...screens, - ...dialogs, -]; - -const services = [DossiersDialogService, ManualAnnotationService, AnnotationProcessingService]; +const components = [...screens, ...dialogs]; @NgModule({ declarations: [...components], - providers: [...services], imports: [CommonModule, SharedModule, SharedDossiersModule, FileUploadDownloadModule, DossiersRoutingModule, OverlayModule], }) export class DossiersModule {} diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index b6ede1e8d..15e995f4f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -6,7 +6,6 @@ import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqse import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; @@ -14,6 +13,7 @@ import { map, pluck, switchMap } from 'rxjs/operators'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-dossier-details', @@ -37,19 +37,19 @@ export class DossierDetailsComponent { statusConfig$: Observable; constructor( - readonly activeDossiersService: ActiveDossiersService, readonly translateChartService: TranslateChartService, readonly filterService: FilterService, + private readonly _dossiersService: DossiersService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _userService: UserService, private readonly _filesService: FilesService, private readonly _dossierStatsService: DossierStatsService, private readonly _toaster: Toaster, private readonly _dialogService: DossiersDialogService, - activatedRoute: ActivatedRoute, + private readonly _activatedRoute: ActivatedRoute, ) { - this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossier$ = this.activeDossiersService.getEntityChanged$(this.dossierId).pipe(shareLast()); + this.dossierId = _activatedRoute.snapshot.paramMap.get(DOSSIER_ID); + this.dossier$ = this._dossiersService.getEntityChanged$(this.dossierId).pipe(shareLast()); this.dossierStats$ = this.dossier$.pipe( pluck('dossierId'), switchMap(dossierId => this._dossierStatsService.watch$(dossierId)), @@ -65,7 +65,7 @@ export class DossierDetailsComponent { 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 firstValueFrom(this.activeDossiersService.createOrUpdate(dossierRequest)); + await firstValueFrom(this._dossiersService.createOrUpdate(dossierRequest)); const ownerName = this._userService.getNameForId(owner.id); const dossierName = dossier.dossierName; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts index 021efffce..0bc097f52 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { File } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { UserService } from '@services/user.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ selector: 'redaction-file-workload', @@ -16,7 +16,7 @@ export class FileWorkloadComponent { constructor( readonly userService: UserService, private readonly _dictionariesMapService: DictionariesMapService, - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _dossiersService: DossiersService, ) {} get suggestionColor() { @@ -44,9 +44,7 @@ export class FileWorkloadComponent { } private _getDictionaryColor(type: string) { - return this._dictionariesMapService.getDictionaryColor( - type, - this._activeDossiersService.find(this.file.dossierId).dossierTemplateId, - ); + const dossierTemplateId = this._dossiersService.find(this.file.dossierId).dossierTemplateId; + return this._dictionariesMapService.getDictionaryColor(type, dossierTemplateId); } } 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 ee750234f..5d5ad670c 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 @@ -164,7 +164,7 @@ export class ConfigService { checkedRequiredFilters: () => NestedFilter[], checkedNotRequiredFilters: () => NestedFilter[], ) { - const allDistinctWorkflowFileStatuses = new Set(); + const allDistinctWorkflowFileStatuses = new Set(); const allDistinctPeople = new Set(); const allDistinctAddedDates = new Set(); const allDistinctNeedsWork = new Set(); @@ -328,7 +328,9 @@ export class ConfigService { } _recentlyModifiedChecker = (file: File) => - moment(file.lastUpdated).add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS, 'hours').isAfter(moment()); + moment(file.lastUpdated) + .add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS as number, 'hours') + .isAfter(moment()); _assignedToMeChecker = (file: File) => file.assignee === this._userService.currentUser.id; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts index 0b9582d02..752e28458 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts @@ -9,7 +9,6 @@ import { DossierOverviewBulkActionsComponent } from './components/bulk-actions/d import { DossierDetailsComponent } from './components/dossier-details/dossier-details.component'; import { DossierDetailsStatsComponent } from './components/dossier-details-stats/dossier-details-stats.component'; import { TableItemComponent } from './components/table-item/table-item.component'; -import { ConfigService } from './config.service'; import { SharedDossiersModule } from '../../shared/shared-dossiers.module'; import { FileWorkloadComponent } from './components/table-item/file-workload/file-workload.component'; import { FileStatsComponent } from './components/file-stats/file-stats.component'; @@ -18,7 +17,6 @@ import { ScreenHeaderComponent } from './components/screen-header/screen-header. import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component'; import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component'; import { DateColumnComponent } from './components/table-item/date-column/date-column.component'; -import { BulkActionsService } from './services/bulk-actions.service'; const routes: Routes = [ { @@ -46,7 +44,6 @@ const routes: Routes = [ FileNameColumnComponent, DateColumnComponent, ], - providers: [ConfigService, BulkActionsService], imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule], }) export class DossierOverviewModule {} 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 c62cee103..a8e088dab 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 @@ -38,18 +38,26 @@ import { PermissionsService } from '@services/permissions.service'; import { ActivatedRoute, Router } from '@angular/router'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; import { ConfigService } from '../config.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; +import { BulkActionsService } from '../services/bulk-actions.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; @Component({ templateUrl: './dossier-overview-screen.component.html', styleUrls: ['./dossier-overview-screen.component.scss'], - providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => DossierOverviewScreenComponent) }], + providers: [ + ...DefaultListingServices, + ConfigService, + BulkActionsService, + { provide: ListingComponent, useExisting: forwardRef(() => DossierOverviewScreenComponent) }, + dossiersServiceProvider, + ], changeDetection: ChangeDetectionStrategy.OnPush, }) export class DossierOverviewScreenComponent extends ListingComponent implements OnInit, OnDestroy, OnAttach { @@ -77,8 +85,8 @@ export class DossierOverviewScreenComponent extends ListingComponent imple constructor( protected readonly _injector: Injector, private readonly _router: Router, + private readonly _dossiersService: DossiersService, private readonly _loadingService: LoadingService, - private readonly _activeDossiersService: ActiveDossiersService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _fileUploadService: FileUploadService, private readonly _filesService: FilesService, @@ -89,16 +97,16 @@ export class DossierOverviewScreenComponent extends ListingComponent imple private readonly _userPreferenceService: UserPreferenceService, private readonly _fileMapService: FilesMapService, private readonly _errorService: ErrorService, + private readonly _route: ActivatedRoute, readonly permissionsService: PermissionsService, readonly configService: ConfigService, - readonly activatedRoute: ActivatedRoute, ) { super(_injector); - this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossier$ = this._activeDossiersService + this.dossierId = _route.snapshot.paramMap.get(DOSSIER_ID); + this.dossier$ = this._dossiersService .getEntityChanged$(this.dossierId) .pipe(tap(dossier => (this.dossierTemplateId = dossier.dossierTemplateId))); - this.currentDossier = this._activeDossiersService.find(this.dossierId); + this.currentDossier = this._dossiersService.find(this.dossierId); this._updateFileAttributes(); } @@ -133,7 +141,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple this._computeAllFilters(); }); - this.addSubscription = this._activeDossiersService.dossierFileChanges$ + this.addSubscription = this._dossiersService.dossierFileChanges$ .pipe( filter(dossierId => dossierId === this.dossierId), switchMap(dossierId => this._filesService.loadAll(dossierId)), @@ -176,7 +184,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple @HostListener('drop', ['$event']) onDrop(event: DragEvent): void { - const currentDossier = this._activeDossiersService.find(this.dossierId); + const currentDossier = this._dossiersService.find(this.dossierId); handleFileDrop(event, currentDossier, this._uploadFiles.bind(this)); } @@ -192,7 +200,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } private _setRemovableSubscriptions(): void { - this.addActiveScreenSubscription = this._activeDossiersService + this.addActiveScreenSubscription = this._dossiersService .getEntityDeleted$(this.dossierId) .pipe(tap(() => this._handleDeletedDossier())) .subscribe(); @@ -214,7 +222,7 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } private _loadEntitiesFromState() { - this.currentDossier = this._activeDossiersService.find(this.dossierId); + this.currentDossier = this._dossiersService.find(this.dossierId); this._computeAllFilters(); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts index 037a36118..a6de718d8 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts @@ -10,6 +10,8 @@ import { FilePreviewStateService } from './services/file-preview-state.service'; import { PdfViewerDataService } from '../../services/pdf-viewer-data.service'; import { AnnotationReferencesService } from './services/annotation-references.service'; import { FilterService } from '@iqser/common-ui'; +import { ManualAnnotationService } from '../../services/manual-annotation.service'; +import { AnnotationProcessingService } from '../../services/annotation-processing.service'; export const filePreviewScreenProviders = [ FilterService, @@ -24,4 +26,6 @@ export const filePreviewScreenProviders = [ FilePreviewStateService, PdfViewerDataService, AnnotationReferencesService, + ManualAnnotationService, + AnnotationProcessingService, ]; diff --git a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts index 085e242e1..1e48f5758 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts @@ -2,16 +2,43 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FileAssignService } from './services/file-assign.service'; import { FileActionsComponent } from './components/file-actions/file-actions.component'; -import { IqserIconsModule } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { RedactionImportService } from './services/redaction-import.service'; +import { DossiersDialogService } from '../services/dossiers-dialog.service'; +import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; +import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; +import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; +import { ConfirmArchiveDossierDialogComponent } from '../dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; +import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; +import { EditDossierGeneralInfoComponent } from '../dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component'; +import { EditDossierDownloadPackageComponent } from '../dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component'; +import { EditDossierDictionaryComponent } from '../dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component'; +import { EditDossierAttributesComponent } from '../dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component'; +import { EditDossierTeamComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component'; +import { EditDossierDeletedDocumentsComponent } from '../dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component'; -const components = [FileActionsComponent]; +const components = [ + FileActionsComponent, + DocumentInfoDialogComponent, + EditDossierGeneralInfoComponent, + EditDossierDownloadPackageComponent, + EditDossierDictionaryComponent, + EditDossierAttributesComponent, + EditDossierTeamComponent, + EditDossierDeletedDocumentsComponent, +]; +const dialogs = [ + EditDossierDialogComponent, + AddDossierDialogComponent, + ConfirmArchiveDossierDialogComponent, + AssignReviewerApproverDialogComponent, +]; +const services = [DossiersDialogService, FileAssignService, RedactionImportService]; @NgModule({ - declarations: [...components], - exports: [...components], - providers: [FileAssignService, RedactionImportService], - imports: [CommonModule, IqserIconsModule, SharedModule], + declarations: [...components, ...dialogs], + exports: [...components, ...dialogs], + providers: [...services], + imports: [CommonModule, SharedModule], }) export class SharedDossiersModule {} diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index 2602d59e5..6679e7255 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -1,13 +1,14 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; import { List } from '@iqser/common-ui'; import { ActivatedRouteSnapshot, IsActiveMatchOptions, NavigationEnd, Router } from '@angular/router'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { filter, pluck } from 'rxjs/operators'; import { FilesMapService } from '@services/entity-services/files-map.service'; -import { ActiveDossiersService } from './entity-services/active-dossiers.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions; export type BreadcrumbDisplayType = 'text' | 'dropdown'; @@ -34,10 +35,10 @@ export class BreadcrumbsService { private readonly _store$ = new BehaviorSubject([]); constructor( + private readonly _injector: Injector, private readonly _router: Router, private readonly _translateService: TranslateService, private readonly _filesMapService: FilesMapService, - private readonly _activeDossiersService: ActiveDossiersService, ) { this.breadcrumbs$ = this._store$.asObservable(); @@ -52,6 +53,10 @@ export class BreadcrumbsService { return this._store$.value; } + private get _dossiersService(): DossiersService { + return dossiersServiceResolver(this._injector); + } + private get _mainBreadcrumb(): Breadcrumb { return { name$: of(this._translateService.instant('top-bar.navigation-items.dossiers')), @@ -135,12 +140,13 @@ export class BreadcrumbsService { } private _addDossierBreadcrumb(route: ActivatedRouteSnapshot): void { + const dossiersService = this._dossiersService; const dossierId = route.paramMap.get(DOSSIER_ID); this._append({ - name$: this._activeDossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), + name$: dossiersService.getEntityChanged$(dossierId).pipe(pluck('dossierName')), type: 'text' as BreadcrumbDisplayType, options: { - routerLink: ['/main', 'dossiers', dossierId], + routerLink: ['/main', dossiersService.routerPath, dossierId], routerLinkActiveOptions: { exact: true }, clamp: true, }, @@ -150,11 +156,12 @@ export class BreadcrumbsService { private _addFileBreadcrumb(route: ActivatedRouteSnapshot): void { const dossierId = route.paramMap.get(DOSSIER_ID); const fileId = route.paramMap.get(FILE_ID); + const dossiersService = this._dossiersService; this._append({ name$: this._filesMapService.watch$(dossierId, fileId).pipe(pluck('filename')), type: 'text' as BreadcrumbDisplayType, options: { - routerLink: ['/main', 'dossiers', dossierId, 'file', fileId], + routerLink: ['/main', dossiersService.routerPath, dossierId, 'file', fileId], clamp: true, }, }); diff --git a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts index 0b22e665d..7f842c2c5 100644 --- a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts @@ -1,10 +1,9 @@ import { Injectable, Injector } from '@angular/core'; -import { List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; -import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; -import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; -import { firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs'; +import { List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; +import { Dossier, IDossier } from '@red/domain'; +import { catchError, switchMap, tap } from 'rxjs/operators'; +import { firstValueFrom, Observable, of, timer } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; import { DossiersService } from '@services/entity-services/dossiers.service'; @@ -13,78 +12,21 @@ export interface IDossiersStats { totalAnalyzedPages: number; } -interface DossierChange { - readonly dossierChanges: boolean; - readonly dossierId: string; - readonly fileChanges: boolean; -} - -type DossierChanges = readonly DossierChange[]; - -interface ChangesDetails { - readonly dossierChanges: DossierChanges; -} - -const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); -const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); - @Injectable({ providedIn: 'root', }) export class ActiveDossiersService extends DossiersService { - readonly dossierFileChanges$ = new Subject(); - - constructor(private readonly _toaster: Toaster, protected readonly _injector: Injector) { - super(_injector, 'dossier'); + constructor(protected readonly _injector: Injector) { + super(_injector, 'dossier', 'dossiers'); timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) .pipe( switchMap(() => this.loadOnlyChanged()), - tap(changes => this.#emitFileChanges(changes)), + tap(changes => this._emitFileChanges(changes)), ) .subscribe(); } - loadOnlyChanged(): Observable { - 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( - pluck('dossierChanges'), - switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), - tap(() => this._updateLastChanged()), - ); - } - - hasChangesDetails$(): Observable { - const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; - return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( - filter(changes => changes.dossierChanges.length > 0), - ); - } - - @Validate() - createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { - const showToast = (error: HttpErrorResponse) => { - this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); - return of(undefined); - }; - - return this._post(dossier).pipe( - switchMap(newDossier => this.loadAll().pipe(map(() => this.find(newDossier.dossierId)))), - catchError(showToast), - ); - } - getDeleted(): Promise { return firstValueFrom(this.getAll('deleted-dossiers')); } @@ -118,16 +60,4 @@ export class ActiveDossiersService extends DossiersService { #removeDossiers(dossiers: Dossier[]): void { this.setEntities(this.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); } - - private _load(id: string, queryParams?: List): Observable { - return super._getOne([id], this._defaultModelPath, queryParams).pipe( - map(entity => new Dossier(entity)), - tap(dossier => this.replace(dossier)), - switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId])), - ); - } - - #emitFileChanges(dossierChanges: DossierChanges): void { - dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); - } } diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts index 50709d769..dc41a4462 100644 --- a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts @@ -1,5 +1,4 @@ import { Injectable, Injector } from '@angular/core'; -import { Toaster } from '@iqser/common-ui'; import { Dossier } from '@red/domain'; import { catchError, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; @@ -9,12 +8,8 @@ import { DossiersService } from '@services/entity-services/dossiers.service'; @Injectable({ providedIn: 'root' }) export class ArchivedDossiersService extends DossiersService { - constructor( - protected readonly _injector: Injector, - private readonly _toaster: Toaster, - private readonly _activeDossiersService: ActiveDossiersService, - ) { - super(_injector, 'archived-dossiers'); + constructor(protected readonly _injector: Injector, private readonly _activeDossiersService: ActiveDossiersService) { + super(_injector, 'archived-dossiers', 'archive'); } archive(dossiers: Dossier[]): Observable { @@ -26,14 +21,13 @@ export class ArchivedDossiersService extends DossiersService { dossiers.map(d => d.id), `${this._defaultModelPath}/archive`, ).pipe( - tap(() => this.#removeDossiers(dossiers)), + tap(() => this.#removeFromActiveDossiers(dossiers)), catchError(showToast), ); } - #removeDossiers(dossiers: Dossier[]): void { - this._activeDossiersService.setEntities( - this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)), - ); + #removeFromActiveDossiers(dossiers: Dossier[]): void { + const remainingEntities = this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)); + this._activeDossiersService.setEntities(remainingEntities); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts new file mode 100644 index 000000000..20f342608 --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts @@ -0,0 +1,15 @@ +import { ActivatedRoute } from '@angular/router'; +import { Injector, ProviderToken } from '@angular/core'; +import { DossiersService } from './dossiers.service'; + +export const dossiersServiceResolver = (injector: Injector) => { + const route = injector.get(ActivatedRoute); + const token: ProviderToken = (route.firstChild || route).snapshot.data.dossiersService; + return injector.get(token); +}; + +export const dossiersServiceProvider = { + provide: DossiersService, + useFactory: dossiersServiceResolver, + deps: [Injector], +}; diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index cd2c67a19..cf383c3dc 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -1,25 +1,84 @@ -import { EntitiesService, List, mapEach, shareLast } from '@iqser/common-ui'; -import { Dossier, IDossier } from '@red/domain'; -import { combineLatest, Observable } from 'rxjs'; -import { filter, map, mapTo, switchMap, tap } from 'rxjs/operators'; +import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; +import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; +import { combineLatest, forkJoin, Observable, of, Subject, throwError } from 'rxjs'; +import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; import { Injector } from '@angular/core'; import { DossierStateService } from './dossier-state.service'; import { DossierStatsService } from './dossier-stats.service'; import { IDossiersStats } from '@services/entity-services/active-dossiers.service'; +import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +interface DossierChange { + readonly dossierChanges: boolean; + readonly dossierId: string; + readonly fileChanges: boolean; +} + +type DossierChanges = readonly DossierChange[]; + +interface ChangesDetails { + readonly dossierChanges: DossierChanges; +} + +const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); +const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); export abstract class DossiersService extends EntitiesService { + readonly dossierFileChanges$ = new Subject(); readonly generalStats$ = this.all$.pipe(switchMap(entities => this.#generalStats$(entities))); protected readonly _dossierStatsService = this._injector.get(DossierStatsService); protected readonly _dossierStateService = this._injector.get(DossierStateService); + protected readonly _toaster = this._injector.get(Toaster); - protected constructor(protected readonly _injector: Injector, protected readonly _path: string) { + protected constructor(protected readonly _injector: Injector, protected readonly _path: string, readonly routerPath: string) { super(_injector, Dossier, _path); } + @Validate() + createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { + const showToast = (error: HttpErrorResponse) => { + this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); + return of(undefined); + }; + + return this._post(dossier, 'dossier').pipe( + switchMap(newDossier => this.loadAll().pipe(map(() => this.find(newDossier.dossierId)))), + catchError(showToast), + ); + } + + loadOnlyChanged(): Observable { + 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( + pluck('dossierChanges'), + switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), + tap(() => this._updateLastChanged()), + ); + } + + hasChangesDetails$(): Observable { + const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; + return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( + filter(changes => changes.dossierChanges.length > 0), + ); + } + loadAll(): Observable { const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); return this.getAll().pipe( - mapEach(entity => new Dossier(entity)), + mapEach(entity => new Dossier(entity, this.routerPath)), /* Load stats before updating entities */ switchMap(dossiers => this._dossierStatsService.getFor(dossierIds(dossiers)).pipe(mapTo(dossiers))), switchMap(dossiers => this._dossierStateService.loadAllForAllTemplates().pipe(mapTo(dossiers))), @@ -27,6 +86,18 @@ export abstract class DossiersService extends EntitiesService ); } + protected _emitFileChanges(dossierChanges: DossierChanges): void { + dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); + } + + private _load(id: string, queryParams?: List): Observable { + return super._getOne([id], this._defaultModelPath, queryParams).pipe( + map(entity => new Dossier(entity, 'dossiers')), + tap(dossier => this.replace(dossier)), + switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId])), + ); + } + #computeStats(entities: List): IDossiersStats { let totalAnalyzedPages = 0; const totalPeople = new Set(); diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 257e618c1..3298ccb55 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -1,13 +1,21 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; import { UserService } from './user.service'; import { Dossier, File, IComment, IDossier } from '@red/domain'; -import { ActiveDossiersService } from './entity-services/active-dossiers.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActivatedRoute } from '@angular/router'; +import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; -@Injectable({ - providedIn: 'root', -}) +@Injectable({ providedIn: 'root' }) export class PermissionsService { - constructor(private readonly _userService: UserService, private readonly _activeDossiersService: ActiveDossiersService) {} + constructor( + private readonly _userService: UserService, + private readonly _route: ActivatedRoute, + private readonly _injector: Injector, + ) {} + + private get _dossiersService(): DossiersService { + return dossiersServiceResolver(this._injector); + } isReviewerOrApprover(file: File): boolean { const dossier = this._getDossier(file); @@ -228,6 +236,6 @@ export class PermissionsService { } private _getDossier(file: File): Dossier { - return this._activeDossiersService.find(file.dossierId); + return this._dossiersService.find(file.dossierId); } } diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts index b95caf827..e6304b02c 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.model.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts @@ -25,7 +25,7 @@ export class Dossier implements IDossier, IListable { readonly archivedTime: string; readonly hasReviewers: boolean; - constructor(dossier: IDossier) { + constructor(dossier: IDossier, readonly routerPath: string) { this.dossierId = dossier.dossierId; this.approverIds = dossier.approverIds; this.date = dossier.date; @@ -53,7 +53,7 @@ export class Dossier implements IDossier, IListable { } get routerLink(): string { - return `/main/dossiers/${this.dossierId}`; + return `/main/${this.routerPath}/${this.dossierId}`; } get searchKey(): string { From e50b5bd56768fdbdf027753b48bebedebe143cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 22 Feb 2022 23:31:47 +0200 Subject: [PATCH 06/20] Trash dossiers service --- .../src/app/guards/trash-dossiers.guard.ts | 14 +++ .../notifications/notifications.module.ts | 2 +- .../user-profile/user-profile.module.ts | 2 +- .../app/modules/admin/admin-routing.module.ts | 9 +- .../screens/trash/trash-screen.component.ts | 109 +++++------------- .../modules/archive/archive-routing.module.ts | 2 +- .../edit-dossier-general-info.component.ts | 4 +- .../active-dossiers.service.ts | 37 +----- .../entity-services/trash-dossiers.service.ts | 83 +++++++++++++ libs/red-domain/src/index.ts | 1 + .../red-domain/src/lib/trash-dossier/index.ts | 1 + .../lib/trash-dossier/trash-dossier.model.ts | 69 +++++++++++ 12 files changed, 207 insertions(+), 126 deletions(-) create mode 100644 apps/red-ui/src/app/guards/trash-dossiers.guard.ts create mode 100644 apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts create mode 100644 libs/red-domain/src/lib/trash-dossier/index.ts create mode 100644 libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts diff --git a/apps/red-ui/src/app/guards/trash-dossiers.guard.ts b/apps/red-ui/src/app/guards/trash-dossiers.guard.ts new file mode 100644 index 000000000..70587e75f --- /dev/null +++ b/apps/red-ui/src/app/guards/trash-dossiers.guard.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { CanActivate } from '@angular/router'; +import { firstValueFrom } from 'rxjs'; +import { TrashDossiersService } from '../services/entity-services/trash-dossiers.service'; + +@Injectable({ providedIn: 'root' }) +export class TrashDossiersGuard implements CanActivate { + constructor(private readonly _trashDossiersService: TrashDossiersService) {} + + async canActivate(): Promise { + await firstValueFrom(this._trashDossiersService.loadAll()); + return true; + } +} diff --git a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts index ef7874558..5f9b8c77b 100644 --- a/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/notifications/notifications.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { NotificationsScreenComponent } from './notifications-screen/notifications-screen.component'; -import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; +import { PendingChangesGuard } from '@guards/can-deactivate.guard'; const routes = [{ path: '', component: NotificationsScreenComponent, canDeactivate: [PendingChangesGuard] }]; diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts index 775a99569..78c3ec932 100644 --- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts +++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@shared/shared.module'; import { UserProfileScreenComponent } from './user-profile-screen/user-profile-screen.component'; -import { PendingChangesGuard } from '../../../../guards/can-deactivate.guard'; +import { PendingChangesGuard } from '@guards/can-deactivate.guard'; const routes = [{ path: '', component: UserProfileScreenComponent, canDeactivate: [PendingChangesGuard] }]; diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index bb0a2a0e8..180801557 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -17,11 +17,12 @@ import { TrashScreenComponent } from './screens/trash/trash-screen.component'; import { GeneralConfigScreenComponent } from './screens/general-config/general-config-screen.component'; import { BaseAdminScreenComponent } from './base-admin-screen/base-admin-screen.component'; import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; -import { DossierTemplatesGuard } from '../../guards/dossier-templates.guard'; +import { DossierTemplatesGuard } from '@guards/dossier-templates.guard'; import { DICTIONARY_TYPE, DOSSIER_TEMPLATE_ID } from '@utils/constants'; -import { DossierTemplateExistsGuard } from '../../guards/dossier-template-exists.guard'; -import { DictionaryExistsGuard } from '../../guards/dictionary-exists.guard'; +import { DossierTemplateExistsGuard } from '@guards/dossier-template-exists.guard'; +import { DictionaryExistsGuard } from '@guards/dictionary-exists.guard'; import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component'; +import { TrashDossiersGuard } from '@guards/trash-dossiers.guard'; const routes: Routes = [ { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, @@ -200,7 +201,7 @@ const routes: Routes = [ component: TrashScreenComponent, canActivate: [CompositeRouteGuard], data: { - routeGuards: [AuthGuard, RedRoleGuard], + routeGuards: [AuthGuard, RedRoleGuard, TrashDossiersGuard], requiredRoles: ['RED_MANAGER'], }, }, diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts index ddb82b7d0..188ad23c7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts @@ -1,45 +1,42 @@ -import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angular/core'; import { CircleButtonTypes, ConfirmationDialogInput, - DefaultListingServices, - IListable, + DefaultListingServicesTmp, + EntitiesService, ListingComponent, LoadingService, SortingOrders, TableColumnConfig, TitleColors, } from '@iqser/common-ui'; -import { ConfigService } from '@services/config.service'; -import * as moment from 'moment'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Observable } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; -import { getLeftDateTime } from '@utils/functions'; import { RouterHistoryService } from '@services/router-history.service'; -import { IDossier } from '@red/domain'; -import { PermissionsService } from '@services/permissions.service'; - -interface DossierListItem extends IDossier, IListable { - readonly canRestore: boolean; - readonly canHardDelete: boolean; - readonly restoreDate: string; -} +import { TrashDossier } from '@red/domain'; +import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; @Component({ templateUrl: './trash-screen.component.html', styleUrls: ['./trash-screen.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - providers: [...DefaultListingServices, { provide: ListingComponent, useExisting: forwardRef(() => TrashScreenComponent) }], + providers: [ + ...DefaultListingServicesTmp, + { + provide: EntitiesService, + useExisting: TrashDossiersService, + }, + { provide: ListingComponent, useExisting: forwardRef(() => TrashScreenComponent) }, + ], }) -export class TrashScreenComponent extends ListingComponent implements OnInit { +export class TrashScreenComponent extends ListingComponent { readonly circleButtonTypes = CircleButtonTypes; readonly tableHeaderLabel = _('trash.table-header.title'); readonly canRestoreSelected$ = this._canRestoreSelected$; readonly canHardDeleteSelected$ = this._canHardDeleteSelected$; - readonly tableColumnConfigs: TableColumnConfig[] = [ + readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('trash.table-col-names.name'), sortByKey: 'searchKey' }, { label: _('trash.table-col-names.owner'), class: 'user-column' }, { label: _('trash.table-col-names.deleted-on'), sortByKey: 'softDeletedTime' }, @@ -49,13 +46,16 @@ export class TrashScreenComponent extends ListingComponent impl constructor( protected readonly _injector: Injector, private readonly _loadingService: LoadingService, - private readonly _permissionsService: PermissionsService, - private readonly _activeDossiersService: ActiveDossiersService, + private readonly _trashDossiersService: TrashDossiersService, readonly routerHistoryService: RouterHistoryService, - private readonly _configService: ConfigService, private readonly _adminDialogService: AdminDialogService, ) { super(_injector); + + this.sortingService.setSortingOption({ + column: 'softDeletedTime', + order: SortingOrders.desc, + }); } private get _canRestoreSelected$(): Observable { @@ -72,17 +72,7 @@ export class TrashScreenComponent extends ListingComponent impl ); } - disabledFn = (dossier: DossierListItem) => !dossier.canRestore; - - async ngOnInit(): Promise { - this._loadingService.start(); - await this._loadDossiersData(); - this.sortingService.setSortingOption({ - column: 'softDeletedTime', - order: SortingOrders.desc, - }); - this._loadingService.stop(); - } + disabledFn = (dossier: TrashDossier) => !dossier.canRestore; hardDelete(dossiers = this.listingService.selected): void { const data = new ConfirmationDialogInput({ @@ -95,60 +85,13 @@ export class TrashScreenComponent extends ListingComponent impl }, }); this._adminDialogService.openDialog('confirm', null, data, () => { - this._loadingService.loadWhile(this._hardDelete(dossiers)); + const dossierIds: string[] = dossiers.map(d => d.id); + this._loadingService.loadWhile(this._trashDossiersService.hardDelete(dossierIds)); }); } restore(dossiers = this.listingService.selected): void { - this._loadingService.loadWhile(this._restore(dossiers)); - } - - private _getRestoreDate(softDeletedTime: string): string { - return moment(softDeletedTime).add(this._configService.values.DELETE_RETENTION_HOURS, 'hours').toISOString(); - } - - private async _loadDossiersData(): Promise { - this.entitiesService.setEntities(this._toListItems(await this._activeDossiersService.getDeleted()).filter(d => d.canRestore)); - } - - private _canRestoreDossier(restoreDate: string): boolean { - const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); - - return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft > 0; - } - - private _toListItems(dossiers: IDossier[]): DossierListItem[] { - return dossiers.map(dossier => this._toListItem(dossier)); - } - - private _toListItem(dossier: IDossier): DossierListItem { - const restoreDate = this._getRestoreDate(dossier.softDeletedTime); - return { - id: dossier.dossierId, - ...dossier, - searchKey: dossier.dossierName, - restoreDate, - canRestore: this._canRestoreDossier(restoreDate), - canHardDelete: this._permissionsService.canDeleteDossier(dossier), - // Because of migrations, for some this is not set - softDeletedTime: dossier.softDeletedTime || '-', - }; - } - - private async _restore(dossiers: DossierListItem[]): Promise { - const dossierIds = dossiers.map(d => d.id); - await this._activeDossiersService.restore(dossierIds); - this._removeFromList(dossierIds); - } - - private async _hardDelete(dossiers: DossierListItem[]) { - const dossierIds = dossiers.map(d => d.id); - await this._activeDossiersService.hardDelete(dossierIds); - this._removeFromList(dossierIds); - } - - private _removeFromList(ids: string[]): void { - const entities = this.entitiesService.all.filter(e => !ids.includes(e.id)); - this.entitiesService.setEntities(entities); + const dossierIds: string[] = dossiers.map(d => d.id); + this._loadingService.loadWhile(this._trashDossiersService.restore(dossierIds)); } } diff --git a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts index 36e88ed79..905da9c09 100644 --- a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts @@ -5,7 +5,7 @@ import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-scr import { DOSSIER_ID } from '@utils/constants'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { ARCHIVED_DOSSIERS_SERVICE } from '../../tokens'; -import { DossierFilesGuard } from '../../guards/dossier-files-guard'; +import { DossierFilesGuard } from '@guards/dossier-files-guard'; const routes: Routes = [ { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 7bf60d961..5062d6720 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -17,6 +17,7 @@ import { DossierStateService } from '@services/entity-services/dossier-state.ser import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { TranslateService } from '@ngx-translate/core'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; @Component({ selector: 'redaction-edit-dossier-general-info', @@ -39,6 +40,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti private readonly _dossierStateService: DossierStateService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dossiersService: DossiersService, + private readonly _trashDossiersService: TrashDossiersService, private readonly _dossierStatsService: DossierStatsService, private readonly _formBuilder: FormBuilder, private readonly _dialogService: DossiersDialogService, @@ -139,7 +141,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }, }); this._dialogService.openDialog('confirm', null, data, async () => { - await firstValueFrom(this._dossiersService.delete(this.dossier)); + await firstValueFrom(this._trashDossiersService.delete(this.dossier)); this._editDossierDialogRef.close(); this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted()); }); diff --git a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts index 7f842c2c5..b252b43d2 100644 --- a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts @@ -1,9 +1,6 @@ import { Injectable, Injector } from '@angular/core'; -import { List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; -import { Dossier, IDossier } from '@red/domain'; -import { catchError, switchMap, tap } from 'rxjs/operators'; -import { firstValueFrom, Observable, of, timer } from 'rxjs'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { switchMap, tap } from 'rxjs/operators'; +import { timer } from 'rxjs'; import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; import { DossiersService } from '@services/entity-services/dossiers.service'; @@ -27,37 +24,7 @@ export class ActiveDossiersService extends DossiersService { .subscribe(); } - getDeleted(): Promise { - return firstValueFrom(this.getAll('deleted-dossiers')); - } - - delete(dossier: Dossier): Observable { - const showToast = () => { - this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }); - return of({}); - }; - return super.delete(dossier.dossierId).pipe( - tap(() => this.#removeDossiers([dossier])), - catchError(showToast), - ); - } - - @Validate() - restore(@RequiredParam() dossierIds: List): Promise { - return firstValueFrom(this._post(dossierIds, 'deleted-dossiers/restore').pipe(switchMap(() => this.loadAll()))); - } - - @Validate() - hardDelete(@RequiredParam() dossierIds: List): Promise { - const body = dossierIds.map(id => ({ key: 'dossierId', value: id })); - return firstValueFrom(super.delete(body, 'deleted-dossiers/hard-delete', body)); - } - getCountWithState(dossierStatusId: string): number { return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; } - - #removeDossiers(dossiers: Dossier[]): void { - this.setEntities(this.all.filter(dossier => !dossiers.find(d => dossier.id === d.id))); - } } diff --git a/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts new file mode 100644 index 000000000..a1ebc5a88 --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts @@ -0,0 +1,83 @@ +import { Injectable, Injector } from '@angular/core'; +import { EntitiesService, mapEach, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; +import { Dossier, IDossier, TrashDossier } from '@red/domain'; +import { catchError, switchMap, tap } from 'rxjs/operators'; +import { firstValueFrom, Observable, of } from 'rxjs'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import * as moment from 'moment'; +import { ConfigService } from '../config.service'; +import { PermissionsService } from '../permissions.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; + +export interface IDossiersStats { + totalPeople: number; + totalAnalyzedPages: number; +} + +@Injectable({ + providedIn: 'root', +}) +export class TrashDossiersService extends EntitiesService { + constructor( + protected readonly _injector: Injector, + private readonly _toaster: Toaster, + private readonly _configService: ConfigService, + private readonly _permissionsService: PermissionsService, + private readonly _activeDossiersService: ActiveDossiersService, + ) { + super(_injector, TrashDossier, 'dossier'); + } + + loadAll(): Observable { + return this.#getDeleted().pipe( + mapEach( + dossier => new TrashDossier(dossier, this.#getRestoreDate(dossier), this._permissionsService.canDeleteDossier(dossier)), + ), + tap(dossiers => this.setEntities(dossiers)), + ); + } + + delete(dossier: Dossier): Observable { + const showToast = () => { + this._toaster.error(_('dossier-listing.delete.delete-failed'), { params: dossier }); + return of({}); + }; + return super.delete(dossier.dossierId).pipe( + switchMap(() => this._activeDossiersService.loadAll()), + catchError(showToast), + ); + } + + @Validate() + restore(@RequiredParam() dossierIds: string[]): Promise { + return firstValueFrom( + this._post(dossierIds, 'deleted-dossiers/restore').pipe( + switchMap(() => this._activeDossiersService.loadAll()), + tap(() => this.#removeDossiers(dossierIds)), + ), + ); + } + + @Validate() + hardDelete(@RequiredParam() dossierIds: string[]): Promise { + const body = dossierIds.map(id => ({ key: 'dossierId', value: id })); + return firstValueFrom( + super.delete(body, 'deleted-dossiers/hard-delete', body).pipe( + switchMap(() => this._activeDossiersService.loadAll()), + tap(() => this.#removeDossiers(dossierIds)), + ), + ); + } + + #getRestoreDate(dossier: IDossier): string { + return moment(dossier.softDeletedTime).add(this._configService.values.DELETE_RETENTION_HOURS, 'hours').toISOString(); + } + + #getDeleted(): Observable { + return this.getAll('deleted-dossiers'); + } + + #removeDossiers(dossierIds: string[]): void { + this.setEntities(this.all.filter(dossier => !dossierIds.includes(dossier.id))); + } +} diff --git a/libs/red-domain/src/index.ts b/libs/red-domain/src/index.ts index e2d4bf0e4..7349bef8b 100644 --- a/libs/red-domain/src/index.ts +++ b/libs/red-domain/src/index.ts @@ -20,3 +20,4 @@ export * from './lib/signature'; export * from './lib/legal-basis'; export * from './lib/dossier-stats'; export * from './lib/dossier-state'; +export * from './lib/trash-dossier'; diff --git a/libs/red-domain/src/lib/trash-dossier/index.ts b/libs/red-domain/src/lib/trash-dossier/index.ts new file mode 100644 index 000000000..a90f3227f --- /dev/null +++ b/libs/red-domain/src/lib/trash-dossier/index.ts @@ -0,0 +1 @@ +export * from './trash-dossier.model'; diff --git a/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts b/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts new file mode 100644 index 000000000..0988653f1 --- /dev/null +++ b/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts @@ -0,0 +1,69 @@ +import { List } from '@iqser/common-ui'; +import { DownloadFileType } from '../shared'; +import { DossierStatus, IDossier } from '@red/domain'; +import { getLeftDateTime } from '@utils/functions'; + +export class TrashDossier implements IDossier { + readonly dossierId: string; + readonly dossierTemplateId: string; + readonly ownerId: string; + readonly memberIds: List; + readonly approverIds: List; + readonly reportTemplateIds: List; + readonly dossierName: string; + readonly dossierStatusId: string; + readonly date: string; + readonly dueDate?: string; + readonly description?: string; + readonly downloadFileTypes?: List; + readonly hardDeletedTime?: string; + readonly softDeletedTime?: string; + readonly startDate?: string; + readonly status: DossierStatus; + readonly watermarkEnabled: boolean; + readonly watermarkPreviewEnabled: boolean; + readonly archivedTime: string; + readonly hasReviewers: boolean; + readonly canRestore: boolean; + + constructor(dossier: IDossier, readonly restoreDate: string, readonly canHardDelete: boolean) { + this.dossierId = dossier.dossierId; + this.approverIds = dossier.approverIds; + this.date = dossier.date; + this.description = dossier.description; + this.dossierName = dossier.dossierName; + this.dossierStatusId = dossier.dossierStatusId; + this.dossierTemplateId = dossier.dossierTemplateId; + this.downloadFileTypes = dossier.downloadFileTypes; + this.dueDate = dossier.dueDate; + this.hardDeletedTime = dossier.hardDeletedTime; + this.memberIds = dossier.memberIds; + this.ownerId = dossier.ownerId; + this.reportTemplateIds = dossier.reportTemplateIds; + this.softDeletedTime = dossier.softDeletedTime; + this.startDate = dossier.startDate; + this.status = dossier.status; + this.watermarkEnabled = dossier.watermarkEnabled; + this.watermarkPreviewEnabled = dossier.watermarkPreviewEnabled; + this.archivedTime = dossier.archivedTime; + this.hasReviewers = !!this.memberIds && this.memberIds.length > 1; + + this.canRestore = this.#canRestoreDossier(restoreDate); + // Because of migrations, for some this is not set + this.softDeletedTime = dossier.softDeletedTime || '-'; + } + + get id(): string { + return this.dossierId; + } + + get searchKey(): string { + return this.dossierName; + } + + #canRestoreDossier(restoreDate: string): boolean { + const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); + + return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft > 0; + } +} From 4e120e8a1328daa1d3cd8227d7615bace374b5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 23 Feb 2022 00:06:01 +0200 Subject: [PATCH 07/20] Some permissions --- .../edit-dossier-general-info.component.html | 2 +- .../edit-dossier-general-info.component.ts | 11 ++++++----- ... dossier-overview-screen-header.component.html} | 9 +++++---- ... dossier-overview-screen-header.component.scss} | 0 ...=> dossier-overview-screen-header.component.ts} | 14 ++++++++------ .../dossier-overview/dossier-overview.module.ts | 4 ++-- .../screen/dossier-overview-screen.component.html | 6 +++--- .../dossiers-listing-dossier-name.component.ts | 6 +----- .../red-ui/src/app/services/permissions.service.ts | 8 ++++++-- apps/red-ui/src/assets/i18n/en.json | 2 +- 10 files changed, 33 insertions(+), 29 deletions(-) rename apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/{screen-header.component.html => dossier-overview-screen-header.component.html} (92%) rename apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/{screen-header.component.scss => dossier-overview-screen-header.component.scss} (100%) rename apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/{screen-header.component.ts => dossier-overview-screen-header.component.ts} (88%) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index dc5f3cd46..80428ebdb 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -69,7 +69,7 @@ diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 5062d6720..7ea5e5616 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -154,18 +154,19 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } #getForm(): FormGroup { + const formFieldWithArchivedCheck = value => ({ value, disabled: !!this.dossier.archivedTime }); return this._formBuilder.group({ - dossierName: [this.dossier.dossierName, Validators.required], + dossierName: [formFieldWithArchivedCheck(this.dossier.dossierName), Validators.required], dossierTemplateId: [ { value: this.dossier.dossierTemplateId, - disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles, + disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles || !!this.dossier.archivedTime, }, Validators.required, ], - dossierStatusId: [this.dossier.dossierStatusId], - description: [this.dossier.description], - dueDate: [this.dossier.dueDate], + dossierStatusId: [formFieldWithArchivedCheck(this.dossier.dossierStatusId)], + description: [formFieldWithArchivedCheck(this.dossier.description)], + dueDate: [formFieldWithArchivedCheck(this.dossier.dueDate)], watermarkEnabled: [this.dossier.watermarkEnabled], watermarkPreviewEnabled: [this.dossier.watermarkPreviewEnabled], }); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html similarity index 92% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html rename to apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html index 9ca29d0ab..89d79f89b 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html @@ -1,5 +1,5 @@ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.scss rename to apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts similarity index 88% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts rename to apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts index 866bf824b..5a3024c5d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts @@ -1,5 +1,4 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { RouterHistoryService } from '@services/router-history.service'; import { ActionConfig, CircleButtonTypes, @@ -21,14 +20,16 @@ import { UserService } from '@services/user.service'; import { ConfigService } from '../../config.service'; import { firstValueFrom } from 'rxjs'; import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service'; +import { Router } from '@angular/router'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Component({ - selector: 'redaction-screen-header', - templateUrl: './screen-header.component.html', - styleUrls: ['./screen-header.component.scss'], + selector: 'redaction-dossier-overview-screen-header', + templateUrl: './dossier-overview-screen-header.component.html', + styleUrls: ['./dossier-overview-screen-header.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class ScreenHeaderComponent implements OnInit { +export class DossierOverviewScreenHeaderComponent implements OnInit { @Input() @Required() dossier: Dossier; @Input() @Required() analysisForced: boolean; @Output() @Required() readonly upload = new EventEmitter(); @@ -38,12 +39,13 @@ export class ScreenHeaderComponent implements OnInit { constructor( private readonly _toaster: Toaster, readonly configService: ConfigService, + readonly router: Router, + readonly dossiersService: DossiersService, private readonly _userService: UserService, readonly listingService: ListingService, readonly sortingService: SortingService, readonly permissionsService: PermissionsService, readonly entitiesService: EntitiesService, - readonly routerHistoryService: RouterHistoryService, private readonly _reanalysisService: ReanalysisService, private readonly _loadingService: LoadingService, private readonly _primaryFileAttributeService: PrimaryFileAttributeService, diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts index 752e28458..ec41f0468 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts @@ -13,7 +13,7 @@ import { SharedDossiersModule } from '../../shared/shared-dossiers.module'; import { FileWorkloadComponent } from './components/table-item/file-workload/file-workload.component'; import { FileStatsComponent } from './components/file-stats/file-stats.component'; import { WorkflowItemComponent } from './components/workflow-item/workflow-item.component'; -import { ScreenHeaderComponent } from './components/screen-header/screen-header.component'; +import { DossierOverviewScreenHeaderComponent } from './components/screen-header/dossier-overview-screen-header.component'; import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component'; import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component'; import { DateColumnComponent } from './components/table-item/date-column/date-column.component'; @@ -39,7 +39,7 @@ const routes: Routes = [ TableItemComponent, FileStatsComponent, WorkflowItemComponent, - ScreenHeaderComponent, + DossierOverviewScreenHeaderComponent, ViewModeSelectionComponent, FileNameColumnComponent, DateColumnComponent, 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 7074f226c..2a26b54d5 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,10 +1,10 @@
- + >
@@ -22,7 +22,7 @@ [noDataText]="'dossier-overview.no-data.title' | translate" [noMatchText]="'dossier-overview.no-match.title' | translate" [selectionEnabled]="true" - [showNoDataButton]="true" + [showNoDataButton]="permissionsService.canUploadFiles(dossier)" [tableColumnConfigs]="tableColumnConfigs" [tableItemClasses]="{ disabled: disabledFn, 'last-opened': lastOpenedFn }" helpModeKey="document-list" diff --git a/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts index 82789c4dc..fab9ad4de 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts @@ -1,7 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import * as moment from 'moment'; const DUE_DATE_WARN_DAYS = 14; @@ -16,10 +15,7 @@ export class DossiersListingDossierNameComponent { @Input() dossier: Dossier; @Input() dossierStats: DossierStats; - constructor( - private readonly _dossierTemplatesService: DossierTemplatesService, - private readonly _activeDossiersService: ActiveDossiersService, - ) {} + constructor(private readonly _dossierTemplatesService: DossierTemplatesService) {} get approachingDueDate(): boolean { return this._dueDateDaysDiff >= 0 && this._dueDateDaysDiff <= DUE_DATE_WARN_DAYS; diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 3298ccb55..f7193515a 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -23,7 +23,11 @@ export class PermissionsService { } displayReanalyseBtn(dossier: Dossier): boolean { - return this.isApprover(dossier); + return !dossier.archivedTime && this.isApprover(dossier); + } + + canUploadFiles(dossier: Dossier): boolean { + return !dossier.archivedTime; } canEditFileAttributes(file: File): boolean { @@ -142,7 +146,7 @@ export class PermissionsService { } canArchiveDossier(dossier: IDossier): boolean { - return dossier.ownerId === this._userService.currentUser.id; + return !dossier.archivedTime && dossier.ownerId === this._userService.currentUser.id; } canEditDossier(dossier: Dossier, user = this._userService.currentUser): boolean { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 3cc5b2d29..701824728 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -823,7 +823,7 @@ }, "no-data": { "action": "Upload Document", - "title": "There are no documents yet." + "title": "There are no documents in this dossier." }, "no-match": { "title": "No documents match your current filters." From 0a4facc69a0662282db0dcbd25ee47df250e2810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 23 Feb 2022 16:45:43 +0200 Subject: [PATCH 08/20] Navigation after archive --- .../confirm-archive-dossier-dialog.component.ts | 3 +++ .../edit-dossier-general-info.component.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts index 161eabde6..95df1236c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts @@ -6,6 +6,7 @@ import { firstValueFrom } from 'rxjs'; import { Dossier } from '@red/domain'; import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { Router } from '@angular/router'; @Component({ templateUrl: './confirm-archive-dossier-dialog.component.html', @@ -20,6 +21,7 @@ export class ConfirmArchiveDossierDialogComponent { private readonly _activeDossiersService: ActiveDossiersService, private readonly _archivedDossiersService: ArchivedDossiersService, private readonly _toaster: Toaster, + private readonly _router: Router, @Inject(MAT_DIALOG_DATA) readonly dossier: Dossier, readonly dialogRef: MatDialogRef, ) {} @@ -32,6 +34,7 @@ export class ConfirmArchiveDossierDialogComponent { if (this.valid) { this._loadingService.start(); await firstValueFrom(this._archivedDossiersService.archive([this.dossier])); + await this._router.navigate(['main', 'dossiers']); this._toaster.success(_('dossier-listing.archive.archive-succeeded'), { params: this.dossier }); this.dialogRef.close(true); this._loadingService.stop(); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 7ea5e5616..710b299c3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -8,7 +8,7 @@ import { PermissionsService } from '@services/permissions.service'; import { Router } from '@angular/router'; import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; -import { ConfirmationDialogInput, IconButtonTypes, TitleColors, Toaster } from '@iqser/common-ui'; +import { ConfirmationDialogInput, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; @@ -47,6 +47,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti private readonly _router: Router, private readonly _editDossierDialogRef: MatDialogRef, private readonly _toaster: Toaster, + private readonly _loadingService: LoadingService, private readonly _translateService: TranslateService, ) {} @@ -141,9 +142,12 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }, }); this._dialogService.openDialog('confirm', null, data, async () => { + this._loadingService.start(); await firstValueFrom(this._trashDossiersService.delete(this.dossier)); this._editDossierDialogRef.close(); - this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted()); + await this._router.navigate(['main', 'dossiers']); + this._loadingService.stop(); + this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: this.dossier }); }); } @@ -172,10 +176,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti }); } - #notifyDossierDeleted() { - this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: this.dossier }); - } - #filterInvalidDossierTemplates() { this.dossierTemplates = this._dossierTemplatesService.all.filter(r => { if (this.dossier?.dossierTemplateId === r.dossierTemplateId) { From 670e19f98e56473fca17abcaf7f46ca0376fe590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 23 Feb 2022 17:02:35 +0200 Subject: [PATCH 09/20] Fixed isActive check --- .../general-info/edit-dossier-general-info.component.ts | 4 ++-- apps/red-ui/src/app/services/permissions.service.ts | 8 ++++---- libs/red-domain/src/lib/dossiers/dossier.model.ts | 6 +++++- libs/red-domain/src/lib/dossiers/types.ts | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 710b299c3..5f7925320 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -158,13 +158,13 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } #getForm(): FormGroup { - const formFieldWithArchivedCheck = value => ({ value, disabled: !!this.dossier.archivedTime }); + const formFieldWithArchivedCheck = value => ({ value, disabled: !this.dossier.isActive }); return this._formBuilder.group({ dossierName: [formFieldWithArchivedCheck(this.dossier.dossierName), Validators.required], dossierTemplateId: [ { value: this.dossier.dossierTemplateId, - disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles || !!this.dossier.archivedTime, + disabled: this._dossierStatsService.get(this.dossier.dossierId).hasFiles || !this.dossier.isActive, }, Validators.required, ], diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index f7193515a..21dbf29e6 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -23,11 +23,11 @@ export class PermissionsService { } displayReanalyseBtn(dossier: Dossier): boolean { - return !dossier.archivedTime && this.isApprover(dossier); + return dossier.isActive && this.isApprover(dossier); } canUploadFiles(dossier: Dossier): boolean { - return !dossier.archivedTime; + return dossier.isActive; } canEditFileAttributes(file: File): boolean { @@ -145,8 +145,8 @@ export class PermissionsService { return dossier.ownerId === this._userService.currentUser.id; } - canArchiveDossier(dossier: IDossier): boolean { - return !dossier.archivedTime && dossier.ownerId === this._userService.currentUser.id; + canArchiveDossier(dossier: Dossier): boolean { + return dossier.isActive && dossier.ownerId === this._userService.currentUser.id; } canEditDossier(dossier: Dossier, user = this._userService.currentUser): boolean { diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts index e6304b02c..9acde0d21 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.model.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts @@ -1,6 +1,6 @@ import { IListable, List } from '@iqser/common-ui'; import { IDossier } from './dossier'; -import { DossierStatus } from './types'; +import { DossierStatus, DossierStatuses } from './types'; import { DownloadFileType } from '../shared'; export class Dossier implements IDossier, IListable { @@ -60,6 +60,10 @@ export class Dossier implements IDossier, IListable { return this.dossierName; } + get isActive(): boolean { + return this.status === DossierStatuses.ACTIVE; + } + hasMember(memberId: string): boolean { return !!this.memberIds && this.memberIds.indexOf(memberId) >= 0; } diff --git a/libs/red-domain/src/lib/dossiers/types.ts b/libs/red-domain/src/lib/dossiers/types.ts index 34a2be57c..f667390d4 100644 --- a/libs/red-domain/src/lib/dossiers/types.ts +++ b/libs/red-domain/src/lib/dossiers/types.ts @@ -1,6 +1,7 @@ export const DossierStatuses = { ACTIVE: 'ACTIVE', DELETED: 'DELETED', + ARCHIVED: 'ARCHIVED', } as const; export type DossierStatus = keyof typeof DossierStatuses; From 97d956c11cf35a456ef19a5963834627afca4922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 13:08:49 +0200 Subject: [PATCH 10/20] View archived files --- .../src/app/guards/dossier-files-guard.ts | 2 +- .../src/app/guards/file-preview.guard.ts | 11 ++-- .../modules/archive/archive-routing.module.ts | 13 +++- ...sign-reviewer-approver-dialog.component.ts | 23 +------ .../document-info-dialog.component.ts | 12 ++-- ...dit-dossier-deleted-documents.component.ts | 12 ++-- ...dossier-overview-bulk-actions.component.ts | 2 +- .../dossier-details-stats.component.ts | 2 +- ...sier-overview-screen-header.component.html | 1 + ...ossier-overview-screen-header.component.ts | 2 +- .../dossier-overview-screen.component.ts | 2 +- .../services/bulk-actions.service.ts | 54 +++------------- .../dossiers-listing-actions.component.html | 8 +-- .../dossiers-listing-actions.component.ts | 4 +- .../annotations-list.component.ts | 2 +- .../file-workload.component.html | 2 +- .../page-exclusion.component.ts | 7 ++- .../user-management.component.ts | 8 +-- .../file-preview-screen.component.ts | 10 ++- .../services/file-preview-state.service.ts | 29 +++++---- .../file-actions/file-actions.component.ts | 42 +++++++------ .../shared/services/file-assign.service.ts | 29 ++------- .../file-download-btn.component.ts | 2 +- .../expandable-file-actions.component.ts | 10 +-- .../services/file-upload.service.ts | 2 +- .../entity-services/dossiers.service.ts | 3 +- .../file-management.service.ts | 14 +++-- .../entity-services/files-map.service.ts | 6 +- .../services/entity-services/files.service.ts | 56 ++++++++++------- .../platform-search.service.ts | 10 +-- .../src/app/services/permissions.service.ts | 61 +++++++++++++------ .../src/app/services/reanalysis.service.ts | 41 ++++++++----- apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/en.json | 4 +- libs/common-ui | 2 +- .../src/lib/dossiers/dossier.model.ts | 4 +- libs/red-domain/src/lib/files/file.model.ts | 8 +-- 37 files changed, 260 insertions(+), 244 deletions(-) diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index 3594a6897..a438ea900 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -26,7 +26,7 @@ export class DossierFilesGuard implements CanActivate { } if (!this._filesMapService.has(dossierId)) { - await firstValueFrom(this._filesService.loadAll(dossierId)); + await firstValueFrom(this._filesService.loadAll(dossierId, dossiersService.routerPath)); } return true; } diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 43feda4ae..9ad5cc95b 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -1,22 +1,25 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; +import { DossiersService } from '../services/entity-services/dossiers.service'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { constructor( private readonly _filesMapService: FilesMapService, - private readonly _activeDossiersService: ActiveDossiersService, private readonly _router: Router, + private readonly _injector: Injector, ) {} async canActivate(route: ActivatedRouteSnapshot): Promise { + const token: ProviderToken = route.data.dossiersService; + const dossiersService: DossiersService = this._injector.get(token); + const dossierId = route.paramMap.get(DOSSIER_ID); const fileId = route.paramMap.get(FILE_ID); - const dossier = this._activeDossiersService.find(dossierId); + const dossier = dossiersService.find(dossierId); if (!this._filesMapService.get(dossierId, fileId)) { await this._router.navigate([dossier.routerLink]); diff --git a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts index 905da9c09..6c31c1026 100644 --- a/apps/red-ui/src/app/modules/archive/archive-routing.module.ts +++ b/apps/red-ui/src/app/modules/archive/archive-routing.module.ts @@ -2,10 +2,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { BreadcrumbTypes } from '@red/domain'; import { ArchivedDossiersScreenComponent } from './screens/archived-dossiers-screen/archived-dossiers-screen.component'; -import { DOSSIER_ID } from '@utils/constants'; +import { DOSSIER_ID, FILE_ID } from '@utils/constants'; import { CompositeRouteGuard } from '@iqser/common-ui'; import { ARCHIVED_DOSSIERS_SERVICE } from '../../tokens'; import { DossierFilesGuard } from '@guards/dossier-files-guard'; +import { FilePreviewGuard } from '../../guards/file-preview.guard'; const routes: Routes = [ { @@ -24,6 +25,16 @@ const routes: Routes = [ }, loadChildren: () => import('../dossier/screens/dossier-overview/dossier-overview.module').then(m => m.DossierOverviewModule), }, + { + path: `:${DOSSIER_ID}/file/:${FILE_ID}`, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [DossierFilesGuard, FilePreviewGuard], + breadcrumbs: [BreadcrumbTypes.archive, BreadcrumbTypes.dossier, BreadcrumbTypes.file], + dossiersService: ARCHIVED_DOSSIERS_SERVICE, + }, + loadChildren: () => import('../dossier/screens/file-preview-screen/file-preview.module').then(m => m.FilePreviewModule), + }, ]; @NgModule({ 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 7c7cab056..0bf590180 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 @@ -102,28 +102,11 @@ export class AssignReviewerApproverDialogComponent { this._loadingService.start(); try { if (!this.selectedUser) { - await firstValueFrom( - this._filesService.setUnassigned( - this.data.files.map(f => f.fileId), - this.dossier.id, - ), - ); + await firstValueFrom(this._filesService.setUnassigned(this.data.files, this.dossier.id)); } else if (this.data.mode === 'reviewer') { - await firstValueFrom( - this._filesService.setReviewerFor( - this.data.files.map(f => f.fileId), - this.dossier.id, - this.selectedUser, - ), - ); + await firstValueFrom(this._filesService.setReviewerFor(this.data.files, this.dossier.id, this.selectedUser)); } else { - await firstValueFrom( - this._filesService.setUnderApprovalFor( - this.data.files.map(f => f.fileId), - this.dossier.id, - this.selectedUser, - ), - ); + await firstValueFrom(this._filesService.setUnderApprovalFor(this.data.files, this.dossier.id, this.selectedUser)); } } catch (error) { this._toaster.error(_('error.http.generic'), { params: error }); diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index 6c035d370..a51c29780 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -25,10 +25,10 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements private readonly _filesService: FilesService, protected readonly _injector: Injector, protected readonly _dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) readonly data: File, + @Inject(MAT_DIALOG_DATA) readonly file: File, ) { super(_injector, _dialogRef); - this._dossier = this._activeDossiersService.find(this.data.dossierId); + this._dossier = this._activeDossiersService.find(this.file.dossierId); } async ngOnInit() { @@ -42,11 +42,11 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements async save() { const attributeIdToValue = { - ...this.data.fileAttributes?.attributeIdToValue, + ...this.file.fileAttributes?.attributeIdToValue, ...this.form.getRawValue(), }; - await firstValueFrom(this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.data.dossierId, this.data.fileId)); - await firstValueFrom(this._filesService.reload(this.data.dossierId, this.data.fileId)); + await firstValueFrom(this._fileAttributesService.setFileAttributes({ attributeIdToValue }, this.file.dossierId, this.file.fileId)); + await firstValueFrom(this._filesService.reload(this.file.dossierId, this.file)); this._dialogRef.close(true); } @@ -55,7 +55,7 @@ export class DocumentInfoDialogComponent extends BaseDialogComponent implements this.attributes.reduce( (acc, attr) => ({ ...acc, - [attr.id]: [this.data.fileAttributes?.attributeIdToValue[attr.id]], + [attr.id]: [this.file.fileAttributes?.attributeIdToValue[attr.id]], }), {}, ), diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index a9fd70641..6d1bb87d9 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -6,6 +6,7 @@ import { ConfirmationDialogInput, DefaultListingServices, IListable, + IRouterPath, ListingComponent, LoadingService, SortingOrders, @@ -25,7 +26,7 @@ import { workflowFileStatusTranslations } from '../../../translations/file-statu import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; -interface FileListItem extends IFile, IListable { +interface FileListItem extends IFile, IListable, IRouterPath { readonly canHardDelete: boolean; readonly canRestore: boolean; readonly restoreDate: string; @@ -129,14 +130,13 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent !file.canRestore; private async _restore(files: FileListItem[]): Promise { - const fileIds = files.map(f => f.fileId); - await firstValueFrom(this._fileManagementService.restore(fileIds, this.dossier.id)); + const fileIds = files.map(f => f.id); + await firstValueFrom(this._fileManagementService.restore(files, this.dossier.id)); this._removeFromList(fileIds); - await firstValueFrom(this._filesService.loadAll(files[0].dossierId)); } private async _hardDelete(files: FileListItem[]) { - const fileIds = files.map(f => f.fileId); + const fileIds = files.map(f => f.id); await firstValueFrom(this._fileManagementService.hardDelete(this.dossier.id, fileIds)); this._removeFromList(fileIds); } @@ -151,7 +151,7 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent acc && file.canBeOCRed, true); + this.#canOcr = this._permissionsService.canOcrFile(this.selectedFiles); this.#canSetToUnderReview = this._permissionsService.canSetUnderReview(this.selectedFiles) && !isWorkflow; 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 bc8ef922a..8861fe27a 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 @@ -43,7 +43,7 @@ export class DossierDetailsStatsComponent implements OnInit { openEditDossierDialog(section: string): void { const data = { dossierId: this.dossier.dossierId, section }; this._dialogService.openDialog('editDossier', null, data, async () => { - await firstValueFrom(this._filesService.loadAll(this.dossier.dossierId)); + await firstValueFrom(this._filesService.loadAll(this.dossier.dossierId, this.dossier.routerPath)); }); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html index 57de5f509..2edb909ac 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html @@ -14,6 +14,7 @@ imple this.addSubscription = this._dossiersService.dossierFileChanges$ .pipe( filter(dossierId => dossierId === this.dossierId), - switchMap(dossierId => this._filesService.loadAll(dossierId)), + switchMap(dossierId => this._filesService.loadAll(dossierId, this._dossiersService.routerPath)), ) .subscribe(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index aeeaf658a..71ebccdd9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -29,13 +29,7 @@ export class BulkActionsService { this._assignFiles(files, 'approver', true); } else { this._loadingService.start(); - await firstValueFrom( - this._filesService.setUnderApprovalFor( - files.map(f => f.id), - dossier.id, - dossier.approverIds[0], - ), - ); + await firstValueFrom(this._filesService.setUnderApprovalFor(files, dossier.id, dossier.approverIds[0])); this._loadingService.stop(); } } @@ -46,12 +40,7 @@ export class BulkActionsService { async ocr(files: File[]) { this._loadingService.start(); - await firstValueFrom( - this._reanalysisService.ocrFiles( - files.map(f => f.fileId), - files[0].dossierId, - ), - ); + await firstValueFrom(this._reanalysisService.ocrFiles(files, files[0].dossierId)); this._loadingService.stop(); } @@ -65,12 +54,7 @@ export class BulkActionsService { }), async () => { this._loadingService.start(); - await firstValueFrom( - this._fileManagementService.delete( - files.map(item => item.fileId), - files[0].dossierId, - ), - ); + await firstValueFrom(this._fileManagementService.delete(files, files[0].dossierId)); this._loadingService.stop(); }, ); @@ -78,9 +62,8 @@ export class BulkActionsService { async reanalyse(files: File[]) { this._loadingService.start(); - const fileIds = files.map(file => file.fileId); await firstValueFrom( - this._reanalysisService.reanalyzeFilesForDossier(fileIds, files[0].dossierId, { force: true, triggeredByUser: true }), + this._reanalysisService.reanalyzeFilesForDossier(files, files[0].dossierId, { force: true, triggeredByUser: true }), ); this._loadingService.stop(); } @@ -93,24 +76,13 @@ export class BulkActionsService { async toggleAnalysis(files: File[], excluded: boolean) { this._loadingService.start(); - await firstValueFrom( - this._reanalysisService.toggleAnalysis( - files[0].dossierId, - files.map(f => f.id), - excluded, - ), - ); + await firstValueFrom(this._reanalysisService.toggleAnalysis(files[0].dossierId, files, excluded)); this._loadingService.stop(); } async backToUnderReview(files: File[]): Promise { this._loadingService.start(); - await firstValueFrom( - this._filesService.setUnderReviewFor( - files.map(f => f.id), - files[0].dossierId, - ), - ); + await firstValueFrom(this._filesService.setUnderReviewFor(files, files[0].dossierId)); this._loadingService.stop(); } @@ -135,23 +107,13 @@ export class BulkActionsService { }), async () => { this._loadingService.start(); - await firstValueFrom( - this._filesService.setApprovedFor( - files.map(f => f.id), - files[0].dossierId, - ), - ); + await firstValueFrom(this._filesService.setApprovedFor(files, files[0].dossierId)); this._loadingService.stop(); }, ); } else { this._loadingService.start(); - await firstValueFrom( - this._filesService.setApprovedFor( - files.map(f => f.id), - files[0].dossierId, - ), - ); + await firstValueFrom(this._filesService.setApprovedFor(files, files[0].dossierId)); this._loadingService.stop(); } } 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 4001358a5..b58f96883 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 @@ -2,15 +2,15 @@
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index 4dae58539..512dfdc9d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -56,8 +56,8 @@ export class DossiersListingActionsComponent implements OnChanges { this._dialogService.openDialog('editDossier', $event, { dossierId }); } - async reanalyseDossier($event: MouseEvent, id: string): Promise { + async reanalyseDossier($event: MouseEvent, dossier: Dossier): Promise { $event.stopPropagation(); - await firstValueFrom(this._reanalysisService.reanalyzeDossier(id)); + await firstValueFrom(this._reanalysisService.reanalyzeDossier(dossier)); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts index cb29ddd3a..a1ef76c91 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts @@ -5,7 +5,7 @@ import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { ViewModeService } from '../../services/view-mode.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { UserPreferenceService } from '../../../../../../services/user-preference.service'; +import { UserPreferenceService } from '@services/user-preference.service'; @Component({ selector: 'redaction-annotations-list', diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index cc48bfa09..f2c3f2066 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -34,7 +34,7 @@ diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts index ef40421ca..c0d1a0e23 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-exclusion/page-exclusion.component.ts @@ -67,7 +67,7 @@ export class PageExclusionComponent { endPage, }; }); - const excludePages$ = this._reanalysisService.excludePages({ pageRanges }, this._state.dossierId, this._state.fileId); + const excludePages$ = this._reanalysisService.excludePages({ pageRanges }, file.dossierId, file); await firstValueFrom(excludePages$); this._inputComponent.reset(); } catch (e) { @@ -78,12 +78,13 @@ export class PageExclusionComponent { async includePagesRange(range: IPageRange): Promise { this._loadingService.start(); + const file = await this._state.file; const includePages$ = this._reanalysisService.includePages( { pageRanges: [range], }, - this._state.dossierId, - this._state.fileId, + file.dossierId, + file, ); await firstValueFrom(includePages$); this._inputComponent.reset(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts index 91e2c5eee..97df238a6 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts @@ -96,15 +96,15 @@ export class UserManagementComponent { const assigneeId = typeof user === 'string' ? user : user?.id; const reviewerName = this.userService.getNameForId(assigneeId); - const { dossierId, fileId, filename } = file; + const { dossierId, filename } = file; this.loadingService.start(); if (!assigneeId) { - await firstValueFrom(this.filesService.setUnassigned([fileId], dossierId)); + await firstValueFrom(this.filesService.setUnassigned([file], dossierId)); } else if (file.isNew || file.isUnderReview) { - await firstValueFrom(this.filesService.setReviewerFor([fileId], dossierId, assigneeId)); + await firstValueFrom(this.filesService.setReviewerFor([file], dossierId, assigneeId)); } else if (file.isUnderApproval) { - await firstValueFrom(this.filesService.setUnderApprovalFor([fileId], dossierId, assigneeId)); + await firstValueFrom(this.filesService.setUnderApprovalFor([file], dossierId, assigneeId)); } this.loadingService.stop(); 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 2df092289..5f6b2ba18 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 @@ -219,7 +219,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni const file = await this.stateService.file; if (file?.analysisRequired && !file.excludedFromAutomaticAnalysis) { - const reanalyzeFiles = this._reanalysisService.reanalyzeFilesForDossier([this.fileId], this.dossierId, { force: true }); + const reanalyzeFiles = this._reanalysisService.reanalyzeFilesForDossier([file], this.dossierId, { force: true }); await firstValueFrom(reanalyzeFiles); } @@ -416,7 +416,8 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni async annotationsChangedByReviewAction(annotation?: AnnotationWrapper) { this.multiSelectService.deactivate(); - const fileReloaded = await firstValueFrom(this._filesService.reload(this.dossierId, this.fileId)); + const file = await this.stateService.file; + const fileReloaded = await firstValueFrom(this._filesService.reload(this.dossierId, file)); if (!fileReloaded) { await this._reloadAnnotationsForPage(annotation?.pageNumber ?? this.activeViewerPage); } @@ -541,7 +542,10 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni private _subscribeToFileUpdates(): void { this.addActiveScreenSubscription = timer(0, 5000) - .pipe(switchMap(() => this._filesService.reload(this.dossierId, this.fileId))) + .pipe( + switchMap(() => this.stateService.file$), + switchMap(file => this._filesService.reload(this.dossierId, file)), + ) .subscribe(); this.addActiveScreenSubscription = this._activeDossiersService diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index d36846a7f..f6053b336 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Injector } from '@angular/core'; import { BehaviorSubject, firstValueFrom, Observable, pairwise, switchMap } from 'rxjs'; import { FileDataModel } from '@models/file/file-data.model'; import { Dossier, File } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PermissionsService } from '@services/permissions.service'; @@ -10,6 +9,8 @@ import { boolFactory, shareLast } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; +import { DossiersService } from '@services/entity-services/dossiers.service'; +import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; @Injectable() export class FilePreviewStateService { @@ -27,19 +28,19 @@ export class FilePreviewStateService { readonly #fileData$ = new BehaviorSubject(undefined); constructor( - activeDossiersService: ActiveDossiersService, - filesMapService: FilesMapService, - permissionsService: PermissionsService, - activatedRoute: ActivatedRoute, private readonly _fileManagementService: FileManagementService, + private readonly _injector: Injector, + private readonly _route: ActivatedRoute, + private readonly _filesMapService: FilesMapService, + private readonly _permissionsService: PermissionsService, ) { - this.fileId = activatedRoute.snapshot.paramMap.get(FILE_ID); - this.dossierId = activatedRoute.snapshot.paramMap.get(DOSSIER_ID); - this.dossierTemplateId = activeDossiersService.find(this.dossierId).dossierTemplateId; + this.fileId = _route.snapshot.paramMap.get(FILE_ID); + this.dossierId = _route.snapshot.paramMap.get(DOSSIER_ID); + this.dossierTemplateId = this._dossiersService.find(this.dossierId).dossierTemplateId; - this.dossier$ = activeDossiersService.getEntityChanged$(this.dossierId); - this.file$ = filesMapService.watch$(this.dossierId, this.fileId); - [this.isReadonly$, this.isWritable$] = boolFactory(this.file$, file => !permissionsService.canPerformAnnotationActions(file)); + this.dossier$ = this._dossiersService.getEntityChanged$(this.dossierId); + this.file$ = _filesMapService.watch$(this.dossierId, this.fileId); + [this.isReadonly$, this.isWritable$] = boolFactory(this.file$, file => !_permissionsService.canPerformAnnotationActions(file)); this.fileData$ = this.#fileData$.asObservable().pipe(filter(value => !!value)); this.blob$ = this.#blob$; @@ -65,6 +66,10 @@ export class FilePreviewStateService { return firstValueFrom(this.blob$); } + private get _dossiersService(): DossiersService { + return dossiersServiceResolver(this._injector); + } + get #blob$() { return this.file$.pipe( startWith(undefined), diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index d1f53443b..3c1dcde3c 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -74,6 +74,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, showUnderApproval = false; showApprove = false; canToggleAnalysis = false; + showToggleAnalysis = false; showStatusBar = false; showOpenDocument = false; showReanalyseFilePreview = false; @@ -127,28 +128,28 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, return [ { type: ActionTypes.circleBtn, - action: $event => this._openDeleteFileDialog($event), + action: ($event: MouseEvent) => this._openDeleteFileDialog($event), tooltip: _('dossier-overview.delete.action'), icon: 'iqser:trash', show: this.showDelete, }, { type: ActionTypes.circleBtn, - action: $event => this._assign($event), + action: ($event: MouseEvent) => this._assign($event), tooltip: this.assignTooltip, icon: 'red:assign', show: this.showAssign, }, { type: ActionTypes.circleBtn, - action: $event => this._assignToMe($event), + action: ($event: MouseEvent) => this._assignToMe($event), tooltip: _('dossier-overview.assign-me'), icon: 'red:assign-me', show: this.showAssignToSelf, }, { type: ActionTypes.circleBtn, - action: $event => this._triggerImportRedactions($event), + action: ($event: MouseEvent) => this._triggerImportRedactions($event), tooltip: _('dossier-overview.import-redactions'), icon: 'iqser:upload', show: this.showImportRedactions, @@ -178,21 +179,21 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, }, { type: ActionTypes.circleBtn, - action: $event => this._setFileUnderApproval($event), + action: ($event: MouseEvent) => this._setFileUnderApproval($event), tooltip: _('dossier-overview.under-approval'), icon: 'red:ready-for-approval', show: this.showUnderApproval, }, { type: ActionTypes.circleBtn, - action: $event => this._setFileUnderReview($event), + action: ($event: MouseEvent) => this._setFileUnderReview($event), tooltip: _('dossier-overview.under-review'), icon: 'red:undo', show: this.showUnderReview, }, { type: ActionTypes.circleBtn, - action: $event => this.setFileApproved($event), + action: ($event: MouseEvent) => this.setFileApproved($event), tooltip: this.file.canBeApproved ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'), icon: 'red:approved', disabled: !this.file.canBeApproved, @@ -200,14 +201,14 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, }, { type: ActionTypes.circleBtn, - action: $event => this.toggleAutomaticAnalysis($event), + action: ($event: MouseEvent) => this.toggleAutomaticAnalysis($event), tooltip: _('dossier-overview.disable-auto-analysis'), icon: 'red:stop', show: this.canDisableAutoAnalysis, }, { type: ActionTypes.circleBtn, - action: $event => this._reanalyseFile($event), + action: ($event: MouseEvent) => this._reanalyseFile($event), tooltip: _('file-preview.reanalyse-notification'), tooltipClass: 'warn small', icon: 'iqser:refresh', @@ -215,7 +216,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, }, { type: ActionTypes.circleBtn, - action: $event => this.toggleAutomaticAnalysis($event), + action: ($event: MouseEvent) => this.toggleAutomaticAnalysis($event), tooltip: _('dossier-overview.enable-auto-analysis'), buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, icon: 'red:play', @@ -223,21 +224,21 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, }, { type: ActionTypes.circleBtn, - action: $event => this._setFileUnderApproval($event), + action: ($event: MouseEvent) => this._setFileUnderApproval($event), tooltip: _('dossier-overview.under-approval'), icon: 'red:undo', show: this.showUndoApproval, }, { type: ActionTypes.circleBtn, - action: $event => this._ocrFile($event), + action: ($event: MouseEvent) => this._ocrFile($event), tooltip: _('dossier-overview.ocr-file'), icon: 'iqser:ocr', show: this.showOCR, }, { type: ActionTypes.circleBtn, - action: $event => this._reanalyseFile($event), + action: ($event: MouseEvent) => this._reanalyseFile($event), tooltip: _('dossier-overview.reanalyse.action'), icon: 'iqser:refresh', show: this.showReanalyseDossierOverview, @@ -249,7 +250,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: this.toggleTooltip, class: { 'mr-24': this.isDossierOverviewList }, checked: !this.file.excluded, - show: true, + show: this.showToggleAnalysis, }, ].filter(btn => btn.show); } @@ -331,7 +332,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this._loadingService.start(); try { const dossier = this._activeDossiersService.find(this.file.dossierId); - await firstValueFrom(this._fileManagementService.delete([this.file.fileId], this.file.dossierId)); + await firstValueFrom(this._fileManagementService.delete([this.file], this.file.dossierId)); await this._router.navigate([dossier.routerLink]); } catch (error) { this._toaster.error(_('error.http.generic'), { params: error }); @@ -360,7 +361,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, force: true, triggeredByUser: true, }; - await firstValueFrom(this._reanalysisService.reanalyzeFilesForDossier([this.file.fileId], this.file.dossierId, params)); + await firstValueFrom(this._reanalysisService.reanalyzeFilesForDossier([this.file], this.file.dossierId, params)); } private async toggleAutomaticAnalysis($event: MouseEvent) { @@ -378,7 +379,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, private async _ocrFile($event: MouseEvent) { $event.stopPropagation(); this._loadingService.start(); - await firstValueFrom(this._reanalysisService.ocrFiles([this.file.fileId], this.file.dossierId)); + await firstValueFrom(this._reanalysisService.ocrFiles([this.file], this.file.dossierId)); this._loadingService.stop(); } @@ -388,7 +389,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, private async _toggleAnalysis() { this._loadingService.start(); - await firstValueFrom(this._reanalysisService.toggleAnalysis(this.file.dossierId, [this.file.fileId], !this.file.excluded)); + await firstValueFrom(this._reanalysisService.toggleAnalysis(this.file.dossierId, [this.file], !this.file.excluded)); this._loadingService.stop(); } @@ -410,8 +411,9 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this.showApprove = this._permissionsService.isReadyForApproval(this.file) && !this.isDossierOverviewWorkflow; this.canToggleAnalysis = this._permissionsService.canToggleAnalysis(this.file); + this.showToggleAnalysis = this._permissionsService.showToggleAnalysis(this.file); this.showDelete = this._permissionsService.canDeleteFile(this.file); - this.showOCR = this.file.canBeOCRed; + this.showOCR = this._permissionsService.canOcrFile(this.file); this.canReanalyse = this._permissionsService.canReanalyseFile(this.file); this.canDisableAutoAnalysis = this._permissionsService.canDisableAutoAnalysis([this.file]); this.canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis([this.file]); @@ -437,7 +439,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, private async _setFileApproved() { this._loadingService.start(); - await firstValueFrom(this._filesService.setApprovedFor([this.file.id], this.file.dossierId)); + await firstValueFrom(this._filesService.setApprovedFor([this.file], this.file.dossierId)); this._loadingService.stop(); } } diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts index eac7696a8..bd4672134 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts @@ -81,28 +81,11 @@ export class FileAssignService { this._loadingService.start(); try { if (!userId) { - await firstValueFrom( - this._filesService.setUnassigned( - files.map(f => f.fileId), - files[0].dossierId, - ), - ); + await firstValueFrom(this._filesService.setUnassigned(files, files[0].dossierId)); } else if (mode === 'reviewer') { - await firstValueFrom( - this._filesService.setReviewerFor( - files.map(f => f.fileId), - files[0].dossierId, - userId, - ), - ); + await firstValueFrom(this._filesService.setReviewerFor(files, files[0].dossierId, userId)); } else { - await firstValueFrom( - this._filesService.setUnderApprovalFor( - files.map(f => f.fileId), - files[0].dossierId, - userId, - ), - ); + await firstValueFrom(this._filesService.setUnderApprovalFor(files, files[0].dossierId, userId)); } } catch (error) { this._toaster.error(_('error.http.generic'), { params: error }); @@ -117,11 +100,7 @@ export class FileAssignService { private _assignReviewerToCurrentUser(files: File[]): Observable { this._loadingService.start(); return this._filesService - .setReviewerFor( - files.map(f => f.fileId), - files[0].dossierId, - this._userService.currentUser.id, - ) + .setReviewerFor(files, files[0].dossierId, this._userService.currentUser.id) .pipe(tap(() => this._loadingService.stop())); } } diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts index 8009960da..0b595cdf7 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts @@ -38,7 +38,7 @@ export class FileDownloadBtnComponent implements OnChanges { async downloadFiles($event: MouseEvent) { $event.stopPropagation(); const dossierId = this.files[0].dossierId; - const filesIds = this.files.map(f => f.fileId); + const filesIds = this.files.map(f => f.id); await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId)); this._toaster.info(_('download-status.queued')); } diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index df9d6396a..5c57435a8 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -29,6 +29,10 @@ export class ExpandableFileActionsComponent implements OnChanges { private readonly _permissionsService: PermissionsService, ) {} + get scrollableParentView(): ScrollableParentView { + return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; + } + ngOnChanges(changes: SimpleChanges) { if (changes.actions || changes.maxWidth) { if (this.maxWidth) { @@ -59,12 +63,8 @@ export class ExpandableFileActionsComponent implements OnChanges { private async _downloadFiles($event: MouseEvent, files: File[]) { $event.stopPropagation(); const dossierId = files[0].dossierId; - const filesIds = files.map(f => f.fileId); + const filesIds = files.map(f => f.id); await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId)); this._toaster.info(_('download-status.queued')); } - - get scrollableParentView(): ScrollableParentView { - return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; - } } diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts index 5494c0e81..674e28b8a 100644 --- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts +++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts @@ -42,7 +42,7 @@ export class FileUploadService extends GenericService impleme super(_injector, 'upload'); const fileFetch$ = this._fetchFiles$.pipe( throttleTime(250), - switchMap(dossierId => this._filesService.loadAll(dossierId)), + switchMap(dossierId => this._filesService.loadAll(dossierId, 'dossiers')), ); this._subscriptions.add(fileFetch$.subscribe()); const interval$ = interval(2500).pipe(tap(() => this._handleUploads())); diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index cf383c3dc..16b9cb57e 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -90,7 +90,8 @@ export abstract class DossiersService extends EntitiesService dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } - private _load(id: string, queryParams?: List): Observable { + private _load(id: string): Observable { + const queryParams: List = [{ key: 'includeArchived', value: this._path === 'archived-dossiers' }]; return super._getOne([id], this._defaultModelPath, queryParams).pipe( map(entity => new Dossier(entity, 'dossiers')), tap(dossier => this.replace(dossier)), diff --git a/apps/red-ui/src/app/services/entity-services/file-management.service.ts b/apps/red-ui/src/app/services/entity-services/file-management.service.ts index a2187df9c..300ec08b1 100644 --- a/apps/red-ui/src/app/services/entity-services/file-management.service.ts +++ b/apps/red-ui/src/app/services/entity-services/file-management.service.ts @@ -1,4 +1,4 @@ -import { GenericService, HeadersConfiguration, List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; +import { GenericService, HeadersConfiguration, IRouterPath, List, QueryParam, RequiredParam, Validate } from '@iqser/common-ui'; import { Injectable, Injector } from '@angular/core'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; @@ -19,8 +19,10 @@ export class FileManagementService extends GenericService { } @Validate() - delete(@RequiredParam() fileIds: List, @RequiredParam() dossierId: string) { - return super._post(fileIds, `delete/${dossierId}`).pipe(switchMap(() => this._filesService.loadAll(dossierId))); + delete(@RequiredParam() files: List, @RequiredParam() dossierId: string) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return super._post(fileIds, `delete/${dossierId}`).pipe(switchMap(() => this._filesService.loadAll(dossierId, routerPath))); } @Validate() @@ -32,8 +34,10 @@ export class FileManagementService extends GenericService { } @Validate() - restore(@RequiredParam() body: List, @RequiredParam() dossierId: string) { - return this._post(body, `delete/restore/${dossierId}`).pipe(switchMap(() => this._filesService.loadAll(dossierId))); + restore(@RequiredParam() files: List, @RequiredParam() dossierId: string) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, `delete/restore/${dossierId}`).pipe(switchMap(() => this._filesService.loadAll(dossierId, routerPath))); } downloadOriginalFile(dossierId: string, fileId: string, observe?: 'body', indicator?: string): Observable; diff --git a/apps/red-ui/src/app/services/entity-services/files-map.service.ts b/apps/red-ui/src/app/services/entity-services/files-map.service.ts index d71f717d1..bfe6587aa 100644 --- a/apps/red-ui/src/app/services/entity-services/files-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files-map.service.ts @@ -12,7 +12,11 @@ export class FilesMapService extends EntitiesMapService { replaceFiles(files: File[], property: keyof IFile, generateValue: Function) { const newFiles = files.map( file => - new File({ ...file, [property]: generateValue(file[property]), lastUpdated: new Date().toISOString() }, file.reviewerName), + new File( + { ...file, [property]: generateValue(file[property]), lastUpdated: new Date().toISOString() }, + file.reviewerName, + file.routerPath, + ), ); this.replace(newFiles); } diff --git a/apps/red-ui/src/app/services/entity-services/files.service.ts b/apps/red-ui/src/app/services/entity-services/files.service.ts index 8a8109f46..f67a969e7 100644 --- a/apps/red-ui/src/app/services/entity-services/files.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files.service.ts @@ -1,5 +1,5 @@ import { Injectable, Injector } from '@angular/core'; -import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; +import { EntitiesService, IRouterPath, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui'; import { File, IFile } from '@red/domain'; import { Observable } from 'rxjs'; import { UserService } from '../user.service'; @@ -21,40 +21,50 @@ export class FilesService extends EntitiesService { } /** Reload dossier files + stats. */ - loadAll(dossierId: string) { - const files$ = this.getFor(dossierId).pipe(mapEach(file => new File(file, this._userService.getNameForId(file.assignee)))); + loadAll(dossierId: string, routerPath: string) { + const files$ = this.getFor(dossierId).pipe( + mapEach(file => new File(file, this._userService.getNameForId(file.assignee), routerPath)), + ); const loadStats$ = files$.pipe(switchMap(files => this._dossierStatsService.getFor([dossierId]).pipe(mapTo(files)))); return loadStats$.pipe(tap(files => this._filesMapService.set(dossierId, files))); } - reload(dossierId: string, fileId: string): Observable { - return super._getOne([dossierId, fileId]).pipe( - map(file => new File(file, this._userService.getNameForId(file.assignee))), - switchMap(file => this._dossierStatsService.getFor([dossierId]).pipe(mapTo(file))), - map(file => this._filesMapService.replace([file])), + reload(dossierId: string, file: File): Observable { + return super._getOne([dossierId, file.id]).pipe( + map(_file => new File(_file, this._userService.getNameForId(_file.assignee), file.routerPath)), + switchMap(_file => this._dossierStatsService.getFor([dossierId]).pipe(mapTo(_file))), + map(_file => this._filesMapService.replace([_file])), ); } @Validate() - setUnassigned(@RequiredParam() fileIds: List, @RequiredParam() dossierId: string) { + setUnassigned(@RequiredParam() files: List, @RequiredParam() dossierId: string) { const url = `${this._defaultModelPath}/set-assignee/${dossierId}/bulk`; - return this._post(fileIds, url).pipe(switchMap(() => this.loadAll(dossierId))); + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, url).pipe(switchMap(() => this.loadAll(dossierId, routerPath))); } @Validate() - setUnderApprovalFor(@RequiredParam() fileIds: List, @RequiredParam() dossierId: string, assigneeId: string) { + setUnderApprovalFor(@RequiredParam() files: List, @RequiredParam() dossierId: string, assigneeId: string) { const url = `${this._defaultModelPath}/under-approval/${dossierId}/bulk`; - return this._post(fileIds, url, [{ key: 'assigneeId', value: assigneeId }]).pipe(switchMap(() => this.loadAll(dossierId))); + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, url, [{ key: 'assigneeId', value: assigneeId }]).pipe( + switchMap(() => this.loadAll(dossierId, routerPath)), + ); } /** * Assigns a reviewer for a list of files. */ @Validate() - setReviewerFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string, assigneeId: string) { + setReviewerFor(@RequiredParam() files: List, @RequiredParam() dossierId: string, assigneeId: string) { const url = `${this._defaultModelPath}/under-review/${dossierId}/bulk`; - return this._post(filesIds, url, [{ key: 'assigneeId', value: assigneeId }]).pipe( - switchMap(() => this.loadAll(dossierId)), + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, url, [{ key: 'assigneeId', value: assigneeId }]).pipe( + switchMap(() => this.loadAll(dossierId, routerPath)), ); } @@ -62,9 +72,11 @@ export class FilesService extends EntitiesService { * Sets the status APPROVED for a list of files. */ @Validate() - setApprovedFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string) { - return this._post(filesIds, `${this._defaultModelPath}/approved/${dossierId}/bulk`).pipe( - switchMap(() => this.loadAll(dossierId)), + setApprovedFor(@RequiredParam() files: List, @RequiredParam() dossierId: string) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, `${this._defaultModelPath}/approved/${dossierId}/bulk`).pipe( + switchMap(() => this.loadAll(dossierId, routerPath)), ); } @@ -72,9 +84,11 @@ export class FilesService extends EntitiesService { * Sets the status UNDER_REVIEW for a list of files. */ @Validate() - setUnderReviewFor(@RequiredParam() filesIds: List, @RequiredParam() dossierId: string) { - return this._post(filesIds, `${this._defaultModelPath}/under-review/${dossierId}/bulk`).pipe( - switchMap(() => this.loadAll(dossierId)), + setUnderReviewFor(@RequiredParam() files: List, @RequiredParam() dossierId: string) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, `${this._defaultModelPath}/under-review/${dossierId}/bulk`).pipe( + switchMap(() => this.loadAll(dossierId, routerPath)), ); } diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index c96e31909..920b89753 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { GenericService } from '@iqser/common-ui'; -import { IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; +import { Dossier, IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; import { Observable, of, zip } from 'rxjs'; import { mapTo, switchMap } from 'rxjs/operators'; import { ActiveDossiersService } from './active-dossiers.service'; @@ -44,11 +44,11 @@ export class PlatformSearchService extends GenericService { const fileNotLoaded = ({ dossierId, fileId }: IMatchedDocument) => !this._filesMapService.get(dossierId, fileId); const dossiersWithNotLoadedFiles = documentsOfActiveDossiers.filter(fileNotLoaded).map(document => document.dossierId); - const dossierIds = Array.from(new Set(dossiersWithNotLoadedFiles)); - return dossierIds.length ? this._loadFilesFor$(dossierIds).pipe(mapTo(searchResponse)) : of(searchResponse); + const dossiers = Array.from(new Set(dossiersWithNotLoadedFiles)).map(dossierId => this._activeDossiersService.find(dossierId)); + return dossiers.length ? this._loadFilesFor$(dossiers).pipe(mapTo(searchResponse)) : of(searchResponse); } - private _loadFilesFor$(dossierIds: string[]) { - return zip(...dossierIds.map(dossierId => this._filesService.loadAll(dossierId))); + private _loadFilesFor$(dossiers: Dossier[]) { + return zip(...dossiers.map(dossier => this._filesService.loadAll(dossier.id, dossier.routerPath))); } } diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 21dbf29e6..75c9f0798 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -30,6 +30,10 @@ export class PermissionsService { return dossier.isActive; } + canDownloadCsvReport(dossier: Dossier): boolean { + return dossier.isActive; + } + canEditFileAttributes(file: File): boolean { const dossier = this._getDossier(file); return ((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier)); @@ -41,6 +45,11 @@ export class PermissionsService { return sameState && files.reduce((acc, _file) => this._canToggleAnalysis(_file) && acc, true); } + showToggleAnalysis(file: File | File[]): boolean { + const files = file instanceof File ? [file] : file; + return this._isActive(files[0]); + } + canReanalyseFile(file: File | File[]): boolean { const files = file instanceof File ? [file] : file; return files.reduce((acc, _file) => this._canReanalyseFile(_file) && acc, true); @@ -64,6 +73,12 @@ export class PermissionsService { return files.reduce((acc, _file) => this._canDeleteFile(_file, dossier) && acc, true); } + canOcrFile(file: File | File[]): boolean { + const files = file instanceof File ? [file] : file; + const dossier = this._getDossier(files[0]); + return files.reduce((acc, _file) => this._canOcrFile(_file, dossier) && acc, true); + } + canAssignToSelf(file: File | File[]): boolean { const files = file instanceof File ? [file] : file; const dossier = this._getDossier(files[0]); @@ -120,7 +135,7 @@ export class PermissionsService { // TODO: Remove '?', after we make sure file is loaded before page canPerformAnnotationActions(file: File): boolean { - return !file.excluded && (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file); + return this._isActive(file) && !file.excluded && (file?.isUnderReview || file?.isUnderApproval) && this.isFileAssignee(file); } canUndoApproval(file: File | File[]): boolean { @@ -171,54 +186,60 @@ export class PermissionsService { } canImportRedactions(file: File) { - return (this.isFileAssignee(file) || this.isApprover(this._getDossier(file))) && !file.isApproved; + return this._isActive(file) && (this.isFileAssignee(file) || this.isApprover(this._getDossier(file))) && !file.isApproved; + } + + private _canOcrFile(file: File, dossier: Dossier): boolean { + return dossier.isActive && file.canBeOCRed; } private _canToggleAnalysis(file: File): boolean { - return this.isFileAssignee(file) && (file.isNew || file.isUnderReview || file.isUnderApproval); + return this._isActive(file) && this.isFileAssignee(file) && (file.isNew || file.isUnderReview || file.isUnderApproval); } // https://jira.iqser.com/browse/RED-2787 private _canDeleteFile(file: File, dossier: Dossier): boolean { return ( - file.isNew || - (file.isUnderReview && !file.assignee && this.isDossierMember(dossier)) || - (file.isUnderApproval && !file.assignee && this.isApprover(dossier)) || - (file.assignee && !file.isApproved && (this.isFileAssignee(file) || this.isOwner(dossier))) + dossier.isActive && + (file.isNew || + (file.isUnderReview && !file.assignee && this.isDossierMember(dossier)) || + (file.isUnderApproval && !file.assignee && this.isApprover(dossier)) || + (file.assignee && !file.isApproved && (this.isFileAssignee(file) || this.isOwner(dossier)))) ); } private _canReanalyseFile(file: File): boolean { - return this.isReviewerOrApprover(file) && file.analysisRequired; + return this._isActive(file) && this.isReviewerOrApprover(file) && file.analysisRequired; } private _canEnableAutoAnalysis(file: File): boolean { - return file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; + return this._isActive(file) && file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; } private _canDisableAutoAnalysis(file: File): boolean { - return !file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; + return this._isActive(file) && !file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; } private _canAssignToSelf(file: File, dossier: Dossier): boolean { - const precondition = this.isDossierMember(dossier) && !this.isFileAssignee(file) && !file.isError && !file.isProcessing; + const precondition = + this._isActive(file) && this.isDossierMember(dossier) && !this.isFileAssignee(file) && !file.isError && !file.isProcessing; return precondition && (file.isNew || file.isUnderReview || (file.isUnderApproval && this.isApprover(dossier))); } private _canSetUnderApproval(file: File): boolean { - return file.isUnderReview && this.isReviewerOrApprover(file); + return this._isActive(file) && file.isUnderReview && this.isReviewerOrApprover(file); } private _canUndoApproval(file: File, dossier: Dossier): boolean { - return file.isApproved && this.isApprover(dossier); + return this._isActive(file) && file.isApproved && this.isApprover(dossier); } private _canBeApproved(file: File): boolean { - return file.canBeApproved; + return this._isActive(file) && file.canBeApproved; } private _canAssignUser(file: File, dossier: Dossier) { - const precondition = !file.isProcessing && !file.isError && !file.isApproved && this.isApprover(dossier); + const precondition = this._isActive(file) && !file.isProcessing && !file.isError && !file.isApproved && this.isApprover(dossier); if (precondition) { if ((file.isNew || file.isUnderReview) && dossier.hasReviewers) { @@ -232,14 +253,20 @@ export class PermissionsService { } private _canUnassignUser(file: File, dossier: Dossier) { - return (file.isUnderReview || file.isUnderApproval) && (this.isFileAssignee(file) || this.isApprover(dossier)); + return ( + this._isActive(file) && (file.isUnderReview || file.isUnderApproval) && (this.isFileAssignee(file) || this.isApprover(dossier)) + ); } private _canSetUnderReview(file: File): boolean { - return file.isUnderApproval; + return this._isActive(file) && file.isUnderApproval; } private _getDossier(file: File): Dossier { return this._dossiersService.find(file.dossierId); } + + private _isActive(file: File): boolean { + return this._getDossier(file).isActive; + } } diff --git a/apps/red-ui/src/app/services/reanalysis.service.ts b/apps/red-ui/src/app/services/reanalysis.service.ts index 03d002626..d58a2e406 100644 --- a/apps/red-ui/src/app/services/reanalysis.service.ts +++ b/apps/red-ui/src/app/services/reanalysis.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; -import { GenericService, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; -import { File, IPageExclusionRequest } from '@red/domain'; +import { GenericService, IRouterPath, List, QueryParam, RequiredParam, Toaster, Validate } from '@iqser/common-ui'; +import { Dossier, File, IPageExclusionRequest } from '@red/domain'; import { catchError, switchMap, tap } from 'rxjs/operators'; import { FilesService } from './entity-services/files.service'; import { FilesMapService } from './entity-services/files-map.service'; @@ -26,17 +26,19 @@ export class ReanalysisService extends GenericService { } @Validate() - excludePages(@RequiredParam() body: IPageExclusionRequest, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) { - return this._post(body, `exclude-pages/${dossierId}/${fileId}`).pipe(switchMap(() => this._filesService.reload(dossierId, fileId))); + excludePages(@RequiredParam() body: IPageExclusionRequest, @RequiredParam() dossierId: string, @RequiredParam() file: File) { + return this._post(body, `exclude-pages/${dossierId}/${file.id}`).pipe(switchMap(() => this._filesService.reload(dossierId, file))); } @Validate() - includePages(@RequiredParam() body: IPageExclusionRequest, @RequiredParam() dossierId: string, @RequiredParam() fileId: string) { - return this._post(body, `include-pages/${dossierId}/${fileId}`).pipe(switchMap(() => this._filesService.reload(dossierId, fileId))); + includePages(@RequiredParam() body: IPageExclusionRequest, @RequiredParam() dossierId: string, @RequiredParam() file: File) { + return this._post(body, `include-pages/${dossierId}/${file.id}`).pipe(switchMap(() => this._filesService.reload(dossierId, file))); } @Validate() - reanalyzeFilesForDossier(@RequiredParam() fileIds: List, @RequiredParam() dossierId: string, params?: ReanalyzeQueryParams) { + reanalyzeFilesForDossier(@RequiredParam() files: List, @RequiredParam() dossierId: string, params?: ReanalyzeQueryParams) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; const queryParams: QueryParam[] = []; if (params?.force) { queryParams.push({ key: 'force', value: true }); @@ -45,18 +47,22 @@ export class ReanalysisService extends GenericService { queryParams.push({ key: 'triggeredByUser', value: true }); } - return this._post(fileIds, `reanalyze/${dossierId}/bulk`, queryParams).pipe(switchMap(() => this._filesService.loadAll(dossierId))); + return this._post(fileIds, `reanalyze/${dossierId}/bulk`, queryParams).pipe( + switchMap(() => this._filesService.loadAll(dossierId, routerPath)), + ); } @Validate() - toggleAnalysis(@RequiredParam() dossierId: string, @RequiredParam() fileIds: string[], excluded?: boolean) { + toggleAnalysis(@RequiredParam() dossierId: string, @RequiredParam() files: List, excluded?: boolean) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; const queryParams: QueryParam[] = []; if (excluded) { queryParams.push({ key: 'excluded', value: excluded }); } return this._post(fileIds, `toggle-analysis/${dossierId}/bulk`, queryParams).pipe( - switchMap(() => this._filesService.loadAll(dossierId)), + switchMap(() => this._filesService.loadAll(dossierId, routerPath)), ); } @@ -80,17 +86,24 @@ export class ReanalysisService extends GenericService { } @Validate() - ocrFiles(@RequiredParam() fileIds: List, @RequiredParam() dossierId: string) { - return this._post(fileIds, `ocr/reanalyze/${dossierId}/bulk`).pipe(switchMap(() => this._filesService.loadAll(dossierId))); + ocrFiles(@RequiredParam() files: List, @RequiredParam() dossierId: string) { + const fileIds = files.map(f => f.id); + const routerPath: string = files[0].routerPath; + return this._post(fileIds, `ocr/reanalyze/${dossierId}/bulk`).pipe( + switchMap(() => this._filesService.loadAll(dossierId, routerPath)), + ); } @Validate() - reanalyzeDossier(@RequiredParam() dossierId: string, force?: boolean) { + reanalyzeDossier(@RequiredParam() dossier: Dossier, force?: boolean) { + const { dossierId, routerPath } = dossier; const queryParams: QueryParam[] = []; if (force) { queryParams.push({ key: 'force', value: force }); } - return this._post({}, `reanalyze/${dossierId}`, queryParams).pipe(switchMap(() => this._filesService.loadAll(dossierId))); + return this._post({}, `reanalyze/${dossierId}`, queryParams).pipe( + switchMap(() => this._filesService.loadAll(dossierId, routerPath)), + ); } } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 78d1498b2..9ee85116b 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 1d0e5658b..1cce3154e 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -322,7 +322,7 @@ }, "table-col-names": { "dossier-status": "Dossier Status", - "last-modified": "Last Modified", + "last-modified": "Archived Time", "name": "Name", "owner": "Owner" }, @@ -1251,6 +1251,7 @@ "reanalyse-notification": "This document was not processed with the latest rule/dictionary set. Analyze now to get updated annotations.", "redacted": "Preview", "redacted-tooltip": "Redaction preview shows only redactions. Consider this a preview for the final redacted version. This view is only available if the file has no pending changes & doesn't require a reanalysis", + "reset-filters": "", "standard": "Standard", "standard-tooltip": "Standard Workload view shows all hints, redactions, recommendations & suggestions. This view allows editing.", "tabs": { @@ -1587,6 +1588,7 @@ "processing": "Processing" }, "readonly": "Read only", + "readonly-archived": "Read only (archived)", "recategorize-image-dialog": { "actions": { "cancel": "Cancel", diff --git a/libs/common-ui b/libs/common-ui index f480a52cc..242789330 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit f480a52cc384eea5ab54fb3b7bbc5db431c1506c +Subproject commit 242789330301767bc38fe62651ea777297159bb3 diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts index 9acde0d21..fba166c8a 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.model.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts @@ -1,9 +1,9 @@ -import { IListable, List } from '@iqser/common-ui'; +import { IListable, IRouterPath, List } from '@iqser/common-ui'; import { IDossier } from './dossier'; import { DossierStatus, DossierStatuses } from './types'; import { DownloadFileType } from '../shared'; -export class Dossier implements IDossier, IListable { +export class Dossier implements IDossier, IListable, IRouterPath { readonly dossierId: string; readonly dossierTemplateId: string; readonly ownerId: string; diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index b5930769c..56e4c1458 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -1,10 +1,10 @@ -import { Entity } from '@iqser/common-ui'; +import { Entity, IRouterPath } from '@iqser/common-ui'; import { StatusSorter } from '../shared'; import { isProcessingStatuses, ProcessingFileStatus, ProcessingFileStatuses, WorkflowFileStatus, WorkflowFileStatuses } from './types'; import { IFile } from './file'; import { FileAttributes } from '../file-attributes'; -export class File extends Entity implements IFile { +export class File extends Entity implements IFile, IRouterPath { readonly added?: string; readonly allManualRedactionsApplied: boolean; readonly analysisDuration?: number; @@ -57,7 +57,7 @@ export class File extends Entity implements IFile { readonly canBeOpened: boolean; readonly canBeOCRed: boolean; - constructor(file: IFile, readonly reviewerName: string) { + constructor(file: IFile, readonly reviewerName: string, readonly routerPath: string) { super(file); this.added = file.added; this.allManualRedactionsApplied = !!file.allManualRedactionsApplied; @@ -125,6 +125,6 @@ export class File extends Entity implements IFile { } get routerLink(): string | undefined { - return this.canBeOpened ? `/main/dossiers/${this.dossierId}/file/${this.fileId}` : undefined; + return this.canBeOpened ? `/main/${this.routerPath}/${this.dossierId}/file/${this.fileId}` : undefined; } } From 6fecb84aa53ec958e3960d58c2e15d3e891054d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 16:26:00 +0200 Subject: [PATCH 11/20] Edit dossier permissions --- .../edit-dossier-attributes.component.ts | 2 +- ...dit-dossier-deleted-documents.component.ts | 5 +- .../edit-dossier-dictionary.component.ts | 6 +- ...it-dossier-download-package.component.html | 40 ++++++---- ...it-dossier-download-package.component.scss | 5 ++ ...edit-dossier-download-package.component.ts | 20 ++++- .../edit-dossier-dialog.component.html | 15 ++-- .../edit-dossier-dialog.component.ts | 77 +++++++++++-------- .../edit-dossier-general-info.component.html | 12 --- .../edit-dossier-general-info.component.ts | 6 -- .../src/app/services/permissions.service.ts | 20 +++++ libs/common-ui | 2 +- 12 files changed, 128 insertions(+), 82 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts index 614d7d632..2e3d0b208 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts @@ -50,7 +50,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa } get disabled(): boolean { - return !this._permissionsService.isOwner(this.dossier); + return !this._permissionsService.canHardDeleteOrRestore(this.dossier); } get valid(): boolean { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index 6d1bb87d9..14c3693b9 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -164,7 +164,10 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent - - +
+ + +
+ +
+ + {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }} + +
+ +
+ + {{ 'edit-dossier-dialog.general-info.form.watermark-preview' | translate }} + +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss index e333d23f3..8cd99c520 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.scss @@ -10,4 +10,9 @@ redaction-select { form { height: calc(100% - 44px); display: flex; + flex-direction: column; + + > div { + display: flex; + } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index ba0ff34b2..424a7d01d 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -40,9 +40,17 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS return this.form.controls['downloadFileTypes']?.value?.length || 0; } - get changed() { - if (this.form) { - for (const key of Object.keys(this.form.getRawValue())) { + get changed(): boolean { + if (!this.form) { + return false; + } + + for (const key of Object.keys(this.form.getRawValue())) { + if (key.startsWith('watermark')) { + if (this.dossier[key] !== this.form.get(key).value) { + return true; + } + } else { if (this.dossier[key].length !== this.form.get(key).value.length) { return true; } @@ -86,6 +94,8 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS ...this.dossier, downloadFileTypes: this.form.get('downloadFileTypes').value, reportTemplateIds: this.form.get('reportTemplateIds').value, + watermarkEnabled: this.form.get('watermarkEnabled').value, + watermarkPreviewEnabled: this.form.get('watermarkPreviewEnabled').value, }; const updatedDossier = await firstValueFrom(this._dossiersService.createOrUpdate(dossier)); @@ -96,6 +106,8 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS this.form.reset({ downloadFileTypes: this.dossier.downloadFileTypes, reportTemplateIds: this.dossier.reportTemplateIds, + watermarkEnabled: this.dossier.watermarkEnabled, + watermarkPreviewEnabled: this.dossier.watermarkPreviewEnabled, }); } @@ -104,6 +116,8 @@ export class EditDossierDownloadPackageComponent implements OnInit, EditDossierS { reportTemplateIds: [this.dossier.reportTemplateIds], downloadFileTypes: [this.dossier.downloadFileTypes], + watermarkEnabled: [this.dossier.watermarkEnabled], + watermarkPreviewEnabled: [this.dossier.watermarkPreviewEnabled], }, { validators: control => diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index ad7414684..944a38375 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -5,13 +5,10 @@
-
+
+ {{ item.sideNavTitle || item.title | translate }} + +
@@ -53,9 +50,9 @@ (click)="save()" [disabled]="disabled || !valid || !changed" color="primary" + id="editDossierSaveButton" mat-flat-button type="button" - id="editDossierSaveButton" > {{ 'edit-dossier-dialog.actions.save' | translate }} @@ -72,5 +69,5 @@
- + 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 345a6de54..2c2109d1f 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 @@ -26,7 +26,7 @@ type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'member providers: [dossiersServiceProvider], }) export class EditDossierDialogComponent extends BaseDialogComponent implements AfterViewInit { - readonly navItems: { key: Section; title?: string; sideNavTitle?: string }[]; + navItems: { key: Section; title?: string; sideNavTitle?: string; readonly?: boolean }[] = []; readonly iconButtonTypes = IconButtonTypes; activeNav: Section; readonly dossier$: Observable; @@ -56,38 +56,12 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A }, ) { super(_injector, _dialogRef, true); - this.navItems = [ - { - key: 'dossierInfo', - title: _('edit-dossier-dialog.nav-items.general-info'), - sideNavTitle: _('edit-dossier-dialog.nav-items.dossier-info'), - }, - { - key: 'downloadPackage', - title: _('edit-dossier-dialog.nav-items.choose-download'), - sideNavTitle: _('edit-dossier-dialog.nav-items.download-package'), - }, - { - key: 'dossierDictionary', - sideNavTitle: _('edit-dossier-dialog.nav-items.dictionary'), - title: _('edit-dossier-dialog.nav-items.dossier-dictionary'), - }, - { - key: 'members', - title: _('edit-dossier-dialog.nav-items.team-members'), - sideNavTitle: _('edit-dossier-dialog.nav-items.members'), - }, - { - key: 'dossierAttributes', - title: _('edit-dossier-dialog.nav-items.dossier-attributes'), - }, - { - key: 'deletedDocuments', - sideNavTitle: _('edit-dossier-dialog.nav-items.deleted-documents'), - }, - ]; - - this.dossier$ = this._activeDossiersService.getEntityChanged$(_data.dossierId).pipe(tap(dossier => (this._dossier = dossier))); + this.dossier$ = this._activeDossiersService.getEntityChanged$(_data.dossierId).pipe( + tap(dossier => { + this._dossier = dossier; + this._initializeNavItems(); + }), + ); this.activeNav = _data.section || 'dossierInfo'; } @@ -173,4 +147,41 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A this.activeNav = key; } } + + private _initializeNavItems(): void { + this.navItems = [ + { + key: 'dossierInfo', + title: _('edit-dossier-dialog.nav-items.general-info'), + sideNavTitle: _('edit-dossier-dialog.nav-items.dossier-info'), + readonly: !this._dossier.isActive, + }, + { + key: 'downloadPackage', + title: _('edit-dossier-dialog.nav-items.choose-download'), + sideNavTitle: _('edit-dossier-dialog.nav-items.download-package'), + }, + { + key: 'dossierDictionary', + sideNavTitle: _('edit-dossier-dialog.nav-items.dictionary'), + title: _('edit-dossier-dialog.nav-items.dossier-dictionary'), + readonly: !this._permissionsService.canEditDossierDictionary(this._dossier), + }, + { + key: 'members', + title: _('edit-dossier-dialog.nav-items.team-members'), + sideNavTitle: _('edit-dossier-dialog.nav-items.members'), + }, + { + key: 'dossierAttributes', + title: _('edit-dossier-dialog.nav-items.dossier-attributes'), + readonly: !this._permissionsService.canEditDossierAttributes(this._dossier), + }, + { + key: 'deletedDocuments', + sideNavTitle: _('edit-dossier-dialog.nav-items.deleted-documents'), + readonly: !this._permissionsService.canHardDeleteOrRestore(this._dossier), + }, + ]; + } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index 80428ebdb..56ddddad3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -38,18 +38,6 @@ type="text" >
- -
- - {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }} - -
- -
- - {{ 'edit-dossier-dialog.general-info.form.watermark-preview' | translate }} - -
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 5f7925320..c169b60ed 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -105,8 +105,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierTemplateId: this.dossier.dossierTemplateId, dossierStatusId: this.dossier.dossierStatusId, description: this.dossier.description, - watermarkEnabled: this.dossier.watermarkEnabled, - watermarkPreviewEnabled: this.dossier.watermarkPreviewEnabled, dueDate: this.dossier.dueDate, }); } @@ -116,8 +114,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti ...this.dossier, dossierName: this.form.get('dossierName').value, description: this.form.get('description').value, - watermarkEnabled: this.form.get('watermarkEnabled').value, - watermarkPreviewEnabled: this.form.get('watermarkPreviewEnabled').value, dueDate: this.hasDueDate ? this.form.get('dueDate').value : undefined, dossierTemplateId: this.form.get(DOSSIER_TEMPLATE_ID).value, dossierStatusId: this.form.get('dossierStatusId').value, @@ -171,8 +167,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti dossierStatusId: [formFieldWithArchivedCheck(this.dossier.dossierStatusId)], description: [formFieldWithArchivedCheck(this.dossier.description)], dueDate: [formFieldWithArchivedCheck(this.dossier.dueDate)], - watermarkEnabled: [this.dossier.watermarkEnabled], - watermarkPreviewEnabled: [this.dossier.watermarkPreviewEnabled], }); } diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 716dd44d5..ae6a1005c 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -75,6 +75,10 @@ export class PermissionsService { return files.reduce((acc, _file) => this._canDeleteFile(_file, dossier) && acc, true); } + canHardDeleteOrRestore(dossier: Dossier): boolean { + return dossier.isActive; + } + canOcrFile(file: File | File[]): boolean { const files = file instanceof File ? [file] : file; const dossier = this._getDossier(files[0]); @@ -170,6 +174,22 @@ export class PermissionsService { return user.isManager && !!dossier?.ownerId; } + canEditDossierDictionary(dossier: Dossier, user = this._userService.currentUser): boolean { + return dossier.isActive && this.canEditDossier(dossier, user); + } + + canEditDossierDictionaryDisplayName(dossier: Dossier, user = this._userService.currentUser): boolean { + return dossier.isActive && this.isOwner(dossier, user); + } + + canEditDossierDictionaryAddAction(dossier: Dossier, user = this._userService.currentUser): boolean { + return dossier.isActive && this.isOwner(dossier, user); + } + + canEditDossierAttributes(dossier: Dossier, user = this._userService.currentUser): boolean { + return dossier.isActive && this.isOwner(dossier, user); + } + isAdmin(user = this._userService.currentUser): boolean { return user.isAdmin; } diff --git a/libs/common-ui b/libs/common-ui index 242789330..d141625d5 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 242789330301767bc38fe62651ea777297159bb3 +Subproject commit d141625d5f3c8f0c57b10f3e341af26ac64402b9 From 0a3e56747eac2b3c18f60b8c6effe5d7d45380b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 20:41:37 +0200 Subject: [PATCH 12/20] Read only indicator --- .../edit-dossier-dialog.component.html | 5 +++++ .../edit-dossier-dialog.component.scss | 12 ++++++++++++ .../edit-dossier-dialog.component.ts | 12 +++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 944a38375..22872775f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -17,6 +17,11 @@ {{ activeNavItem.title | translate }}
+
+ + {{ 'readonly' | translate }} +
+ ; @@ -65,7 +72,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A this.activeNav = _data.section || 'dossierInfo'; } - get activeNavItem(): { key: string; title?: string } { + get activeNavItem(): NavItem { return this.navItems.find(item => item.key === this.activeNav); } @@ -180,7 +187,6 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A { key: 'deletedDocuments', sideNavTitle: _('edit-dossier-dialog.nav-items.deleted-documents'), - readonly: !this._permissionsService.canHardDeleteOrRestore(this._dossier), }, ]; } From e46da277a1364070f1d04bf05c6445ae918bb2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 20:47:02 +0200 Subject: [PATCH 13/20] Enable dialog close --- .../src/app/modules/dossier/services/dossiers-dialog.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts index 9b930ab89..8f17befc7 100644 --- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts @@ -50,6 +50,7 @@ export class DossiersDialogService extends DialogService { }, archiveDossier: { component: ConfirmArchiveDossierDialogComponent, + dialogConfig: { disableClose: false }, }, assignFile: { component: AssignReviewerApproverDialogComponent, From 42b7f833572713755cc98867ab682018bc2a0d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 1 Mar 2022 21:38:18 +0200 Subject: [PATCH 14/20] Reload files after archive --- .../services/entity-services/archived-dossiers.service.ts | 8 +++++++- libs/common-ui | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts index dc41a4462..c94679864 100644 --- a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts @@ -5,10 +5,15 @@ import { Observable, of } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActiveDossiersService } from './active-dossiers.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { FilesMapService } from '@services/entity-services/files-map.service'; @Injectable({ providedIn: 'root' }) export class ArchivedDossiersService extends DossiersService { - constructor(protected readonly _injector: Injector, private readonly _activeDossiersService: ActiveDossiersService) { + constructor( + protected readonly _injector: Injector, + private readonly _activeDossiersService: ActiveDossiersService, + private readonly _filesMapService: FilesMapService, + ) { super(_injector, 'archived-dossiers', 'archive'); } @@ -29,5 +34,6 @@ export class ArchivedDossiersService extends DossiersService { #removeFromActiveDossiers(dossiers: Dossier[]): void { const remainingEntities = this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)); this._activeDossiersService.setEntities(remainingEntities); + this._filesMapService.delete(dossiers.map(d => d.id)); } } diff --git a/libs/common-ui b/libs/common-ui index d141625d5..4d045682a 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d141625d5f3c8f0c57b10f3e341af26ac64402b9 +Subproject commit 4d045682ab46688934883450706e8aee8e2f1d02 From e4df3bb8b0cb2307c9a86e251b385fac92641946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 2 Mar 2022 17:07:24 +0200 Subject: [PATCH 15/20] Confirmation dialogs with checkboxes --- .../src/app/guards/file-preview.guard.ts | 2 +- .../src/app/guards/trash-dossiers.guard.ts | 2 +- .../src/app/modules/admin/admin.module.ts | 4 - .../user-details/user-details.component.ts | 8 +- ...irm-delete-attribute-dialog.component.html | 39 ------ ...irm-delete-attribute-dialog.component.scss | 27 ----- ...nfirm-delete-attribute-dialog.component.ts | 89 -------------- ...confirm-delete-users-dialog.component.html | 47 -------- ...confirm-delete-users-dialog.component.scss | 17 --- .../confirm-delete-users-dialog.component.ts | 55 --------- ...r-attributes-listing-screen.component.html | 8 +- ...r-attributes-listing-screen.component.scss | 9 ++ ...ier-attributes-listing-screen.component.ts | 16 +-- ...e-attributes-listing-screen.component.html | 8 +- ...ile-attributes-listing-screen.component.ts | 41 ++++--- .../user-listing-screen.component.ts | 2 +- .../admin/services/admin-dialog.service.ts | 114 +++++++++++++++--- ...firm-archive-dossier-dialog.component.html | 32 ----- ...firm-archive-dossier-dialog.component.scss | 13 -- ...onfirm-archive-dossier-dialog.component.ts | 49 -------- .../edit-dossier-general-info.component.ts | 27 ++++- .../dossier-documents-status.component.ts | 2 +- .../file-preview-providers.ts | 2 +- .../file-preview-screen.component.ts | 2 +- .../services/annotation-draw.service.ts | 2 +- .../services/dossiers-dialog.service.ts | 6 - .../dossier/shared/shared-dossiers.module.ts | 8 +- .../file-attributes.service.ts | 4 - apps/red-ui/src/assets/i18n/de.json | 10 +- apps/red-ui/src/assets/i18n/en.json | 10 +- libs/common-ui | 2 +- 31 files changed, 194 insertions(+), 463 deletions(-) delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss delete mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts delete mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html delete mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss delete mode 100644 apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 9ad5cc95b..3e12c451f 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -2,7 +2,7 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '../services/entity-services/dossiers.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { diff --git a/apps/red-ui/src/app/guards/trash-dossiers.guard.ts b/apps/red-ui/src/app/guards/trash-dossiers.guard.ts index 70587e75f..d1a8c1a62 100644 --- a/apps/red-ui/src/app/guards/trash-dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/trash-dossiers.guard.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { firstValueFrom } from 'rxjs'; -import { TrashDossiersService } from '../services/entity-services/trash-dossiers.service'; +import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; @Injectable({ providedIn: 'root' }) export class TrashDossiersGuard implements CanActivate { diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index f4087d8b1..d3e083a57 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -15,7 +15,6 @@ import { ColorPickerModule } from 'ngx-color-picker'; import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; import { AddEditDictionaryDialogComponent } from './dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component'; -import { ConfirmDeleteAttributeDialogComponent } from './dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component'; import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component'; import { ComboChartComponent, ComboSeriesVerticalComponent } from './components/combo-chart'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -24,7 +23,6 @@ import { GeneralConfigScreenComponent } from './screens/general-config/general-c import { SmtpAuthDialogComponent } from './dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; import { AddEditUserDialogComponent } from './dialogs/add-edit-user-dialog/add-edit-user-dialog.component'; import { UsersStatsComponent } from './components/users-stats/users-stats.component'; -import { ConfirmDeleteUsersDialogComponent } from './dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component'; import { FileAttributesCsvImportDialogComponent } from './dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; import { ActiveFieldsListingComponent } from './dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component'; import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component'; @@ -55,11 +53,9 @@ const dialogs = [ AddEditDossierTemplateDialogComponent, AddEditDictionaryDialogComponent, AddEditFileAttributeDialogComponent, - ConfirmDeleteAttributeDialogComponent, EditColorDialogComponent, SmtpAuthDialogComponent, AddEditUserDialogComponent, - ConfirmDeleteUsersDialogComponent, FileAttributesConfigurationsDialogComponent, FileAttributesCsvImportDialogComponent, AddEditDossierAttributeDialogComponent, diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts index 220f6aa12..db3744411 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts @@ -4,7 +4,7 @@ import { AdminDialogService } from '../../../services/admin-dialog.service'; import { BaseFormComponent, IconButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { rolesTranslations } from '../../../../../translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { User } from '@red/domain'; +import { IProfileUpdateRequest, User } from '@red/domain'; import { UserService } from '@services/user.service'; import { HttpStatusCode } from '@angular/common/http'; import { firstValueFrom } from 'rxjs'; @@ -83,7 +83,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges async save() { this._loadingService.start(); - const userData = { ...this.form.getRawValue(), roles: this.activeRoles }; + const userData: IProfileUpdateRequest = { ...this.form.getRawValue(), roles: this.activeRoles }; if (!this.user) { await firstValueFrom(this.userService.create(userData)) @@ -105,9 +105,7 @@ export class UserDetailsComponent extends BaseFormComponent implements OnChanges } delete() { - this._dialogService.openDialog('deleteUsers', null, [this.user.id], () => { - this.closeDialog.emit(true); - }); + this._dialogService.deleteUsers([this.user.id], null, () => this.closeDialog.emit(true)); } private _getForm(): FormGroup { diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html deleted file mode 100644 index 04603ec4c..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.html +++ /dev/null @@ -1,39 +0,0 @@ -
-
- {{ 'confirm-delete-file-attribute.title' | translate: translateArgs }} -
- -
-
- - - -
- -
-
- - - - {{ checkbox.label }} - - - -
    -
  • {{ template.fileName }}
    • -
-
- -
- -
-
- -
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss deleted file mode 100644 index aa43ca8aa..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.scss +++ /dev/null @@ -1,27 +0,0 @@ -@use 'variables'; - -.dialog-header { - color: variables.$primary; -} - -.heading { - margin-bottom: 24px; -} - -mat-checkbox { - width: 100%; - - &:not(:last-of-type) { - margin-bottom: 6px; - } -} - -.templates-container { - padding: 0 45px; - margin-top: 0; - flex-direction: column; - - li { - margin: 5px 0; - } -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts deleted file mode 100644 index f5b04b7f1..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { DossierAttributeConfig, FileAttributeConfig, IReportTemplate } from '@red/domain'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { TranslateService } from '@ngx-translate/core'; - -const isFileAttributeConfig = (value: DossierAttributeConfig | FileAttributeConfig): value is FileAttributeConfig => - value instanceof FileAttributeConfig; - -interface CheckBox { - value: boolean; - label: string; -} - -interface DialogData { - attribute: FileAttributeConfig | DossierAttributeConfig; - templates: IReportTemplate[]; -} - -@Component({ - selector: 'redaction-confirm-delete-attribute-dialog', - templateUrl: './confirm-delete-attribute-dialog.component.html', - styleUrls: ['./confirm-delete-attribute-dialog.component.scss'], -}) -export class ConfirmDeleteAttributeDialogComponent { - checkboxes: CheckBox[]; - showToast = false; - - constructor( - private readonly _translateService: TranslateService, - readonly dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: DialogData, - ) { - this.checkboxes = this.checkBoxConfig; - } - - get checkBoxConfig(): CheckBox[] { - const checkBoxes = isFileAttributeConfig(this.data.attribute) ? this._fileAttributeCheckboxes : this._dossierAttributeCheckboxes; - if (this.data.templates.length !== 0) { - checkBoxes.push({ - value: false, - label: this._translateService.instant('confirm-delete-file-attribute.impacted-report', { - count: this.data.templates.length, - }), - }); - } - - return checkBoxes; - } - - get valid() { - return this.checkboxes.reduce((acc, currentValue) => acc && currentValue.value, true); - } - - get type(): 'bulk' | 'single' { - return this.data.attribute ? 'single' : 'bulk'; - } - - get translateArgs() { - return { - type: this.type, - name: this.data.attribute?.label, - }; - } - - private get _fileAttributeCheckboxes(): CheckBox[] { - return [ - { - value: false, - label: this._translateService.instant('confirm-delete-file-attribute.file-impacted-documents', { type: this.type }), - }, - { value: false, label: this._translateService.instant('confirm-delete-file-attribute.file-lost-details') }, - ]; - } - - private get _dossierAttributeCheckboxes(): CheckBox[] { - return [ - { value: false, label: this._translateService.instant('confirm-delete-file-attribute.dossier-impacted-documents') }, - { value: false, label: this._translateService.instant('confirm-delete-file-attribute.dossier-lost-details') }, - ]; - } - - deleteFileAttribute() { - if (this.valid) { - this.dialogRef.close(true); - } else { - this.showToast = true; - } - } -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html deleted file mode 100644 index c4fd082b9..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.html +++ /dev/null @@ -1,47 +0,0 @@ -
-
- -
-
- - - -
- -
-
- - - {{ - checkbox.label - | translate - : { - dossiersCount: dossiersCount, - usersCount: userIds.length - } - }} - -
- -
- -
-
- -
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss deleted file mode 100644 index 52d6e73ce..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.scss +++ /dev/null @@ -1,17 +0,0 @@ -@use 'variables'; - -.dialog-header { - color: variables.$primary; -} - -.heading { - margin-bottom: 24px; -} - -mat-checkbox { - width: 100%; - - &:not(:last-of-type) { - margin-bottom: 6px; - } -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts deleted file mode 100644 index 952f31f18..000000000 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { List, LoadingService } from '@iqser/common-ui'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { UserService } from '@services/user.service'; -import { firstValueFrom } from 'rxjs'; - -@Component({ - selector: 'redaction-confirm-delete-users-dialog', - templateUrl: './confirm-delete-users-dialog.component.html', - styleUrls: ['./confirm-delete-users-dialog.component.scss'], -}) -export class ConfirmDeleteUsersDialogComponent { - readonly checkboxes = [ - { value: false, label: _('confirm-delete-users.impacted-dossiers') }, - { value: false, label: _('confirm-delete-users.impacted-documents') }, - ]; - showToast = false; - dossiersCount: number; - - constructor( - private readonly _userService: UserService, - private readonly _loadingService: LoadingService, - private readonly _activeDossiersService: ActiveDossiersService, - @Inject(MAT_DIALOG_DATA) readonly userIds: List, - readonly dialogRef: MatDialogRef, - ) { - this.dossiersCount = this._dossierCount; - } - - get valid() { - return this.checkboxes[0].value && this.checkboxes[1].value; - } - - private get _dossierCount(): number { - return this._activeDossiersService.all.filter(dw => - this.userIds.reduce((prev, userId) => prev || dw.memberIds.includes(userId), false), - ).length; - } - - async deleteUser() { - if (this.valid) { - this._loadingService.start(); - await firstValueFrom(this._userService.delete(this.userIds)); - this.dialogRef.close(true); - } else { - this.showToast = true; - } - } - - cancel() { - this.dialogRef.close(); - } -} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html index fdb4d86a7..166bf5f5e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html @@ -65,6 +65,12 @@
+ +
    +
  • {{ template.fileName }}
    • +
+ +
@@ -89,7 +95,7 @@ > ; readonly #dossierTemplateId: string; constructor( @@ -58,16 +59,11 @@ export class DossierAttributesListingScreenComponent extends ListingComponent { + async openConfirmDeleteAttributeDialog($event: MouseEvent, attributes: DossierAttributeConfig[] = this.listingService.selected) { + await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this.impactedTemplatesRef, $event, async () => { this._loadingService.start(); - const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id); - await firstValueFrom(this._dossierAttributesService.delete(ids, dossierTemplateId)); + const ids = attributes.map(a => a.id); + await firstValueFrom(this._dossierAttributesService.delete(ids, this.#dossierTemplateId)); await this._loadData(); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index b8df7eacf..355f56117 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -37,6 +37,12 @@
+ +
    +
  • {{ template.fileName }}
    • +
+ + ; private _existingConfiguration: IFileAttributesConfig; @ViewChild('fileInput') private _fileInput: ElementRef; readonly #dossierTemplateId: string; @@ -93,25 +104,15 @@ export class FileAttributesListingScreenComponent extends ListingComponent { + async openConfirmDeleteAttributeDialog( + $event: MouseEvent, + attributes: FileAttributeConfig[] = this.listingService.selected, + ): Promise { + await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this.impactedTemplatesRef, $event, async () => { this._loadingService.start(); - if (fileAttribute) { - await firstValueFrom(this._fileAttributesService.deleteFileAttributes([fileAttribute.id], dossierTemplateId)); - } else { - await firstValueFrom( - this._fileAttributesService.deleteFileAttributes( - this.listingService.selected.map(f => f.id), - dossierTemplateId, - ), - ); - } - await this._dossierTemplatesService.refreshDossierTemplate(dossierTemplateId); + const ids = attributes.map(a => a.id); + await firstValueFrom(this._fileAttributesService.deleteFileAttributes(ids, this.#dossierTemplateId)); + await firstValueFrom(this._dossierTemplatesService.refreshDossierTemplate(this.#dossierTemplateId)); await this._loadData(); }); } @@ -148,7 +149,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent implement } openDeleteUsersDialog(userIds: string[], $event?: MouseEvent) { - this._dialogService.openDialog('deleteUsers', $event, userIds, async () => { + this._dialogService.deleteUsers(userIds, $event, async () => { await this._loadData(); }); } diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 38fd85808..24d471313 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -1,31 +1,42 @@ -import { Injectable } from '@angular/core'; +import { Injectable, TemplateRef } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component'; import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component'; -import { ConfirmDeleteAttributeDialogComponent } from '../dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component'; import { EditColorDialogComponent } from '../dialogs/edit-color-dialog/edit-color-dialog.component'; import { SmtpAuthDialogComponent } from '../dialogs/smtp-auth-dialog/smtp-auth-dialog.component'; import { AddEditUserDialogComponent } from '../dialogs/add-edit-user-dialog/add-edit-user-dialog.component'; -import { ConfirmDeleteUsersDialogComponent } from '../dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component'; import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component'; -import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; +import { + ConfirmationDialogComponent, + ConfirmationDialogInput, + ConfirmOptions, + DialogConfig, + DialogService, + largeDialogConfig, + LoadingService, + TitleColors, +} from '@iqser/common-ui'; import { UploadDictionaryDialogComponent } from '../dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { FileAttributesConfigurationsDialogComponent } from '../dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { firstValueFrom, forkJoin } from 'rxjs'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { UserService } from '../../../services/user.service'; +import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain'; +import { ReportTemplateService } from '../../../services/report-template.service'; type DialogType = | 'confirm' | 'addEditDictionary' | 'editColor' | 'addEditFileAttribute' - | 'deleteAttribute' | 'importFileAttributes' | 'fileAttributesConfigurations' | 'addEditUser' - | 'deleteUsers' | 'smtpAuthConfig' | 'addEditDossierTemplate' | 'addEditDossierAttribute' @@ -52,10 +63,6 @@ export class AdminDialogService extends DialogService { component: AddEditFileAttributeDialogComponent, dialogConfig: { autoFocus: true }, }, - deleteAttribute: { - component: ConfirmDeleteAttributeDialogComponent, - dialogConfig: { disableClose: false }, - }, fileAttributesConfigurations: { component: FileAttributesConfigurationsDialogComponent, }, @@ -63,10 +70,6 @@ export class AdminDialogService extends DialogService { component: FileAttributesCsvImportDialogComponent, dialogConfig: { ...largeDialogConfig, ...{ disableClose: false } }, }, - deleteUsers: { - component: ConfirmDeleteUsersDialogComponent, - dialogConfig: { autoFocus: true, disableClose: false }, - }, addEditUser: { component: AddEditUserDialogComponent, dialogConfig: { autoFocus: true }, @@ -94,7 +97,88 @@ export class AdminDialogService extends DialogService { }, }; - constructor(protected readonly _dialog: MatDialog) { + constructor( + protected readonly _dialog: MatDialog, + private readonly _activeDossiersService: ActiveDossiersService, + private readonly _loadingService: LoadingService, + private readonly _userService: UserService, + private readonly _reportTemplateService: ReportTemplateService, + ) { super(_dialog); } + + deleteUsers(userIds: string[], $event?: MouseEvent, cb?: () => Promise | void): void { + const data = new ConfirmationDialogInput({ + title: _('confirm-delete-users.title'), + question: _('confirm-delete-users.warning'), + confirmationText: _('confirm-delete-users.delete'), + denyText: _('confirm-delete-users.cancel'), + titleColor: TitleColors.WARN, + translateParams: { usersCount: 1, dossiersCount: this._getUsersDossiersCount(userIds) }, + checkboxes: [ + { value: false, label: _('confirm-delete-users.impacted-dossiers') }, + { value: false, label: _('confirm-delete-users.impacted-documents') }, + ], + toastMessage: _('confirm-delete-users.toast-error'), + }); + + this.openDialog('confirm', $event, data, async result => { + if (result === ConfirmOptions.CONFIRM) { + this._loadingService.start(); + await firstValueFrom(this._userService.delete(userIds)); + await cb(); + this._loadingService.stop(); + } + }); + } + + async deleteAttributes( + attributes: IFileAttributeConfig[] | IDossierAttributeConfig[], + dossierTemplateId: string, + impactedTemplatesRef: TemplateRef, + $event?: MouseEvent, + cb?: () => Promise | void, + ): Promise { + this._loadingService.start(); + const templates$ = attributes + .map(a => a.placeholder) + .map(placeholder => this._reportTemplateService.getTemplatesByPlaceholder(dossierTemplateId, placeholder as string)); + const templates: IReportTemplate[] = (await firstValueFrom(forkJoin(templates$))).flat(); + const templateIds = new Set(templates.map(t => t.templateId)); + const uniqueTemplates = Array.from(templateIds).map(id => templates.find(t => t.templateId === id)); + this._loadingService.stop(); + + const data = new ConfirmationDialogInput({ + title: _('confirm-delete-file-attribute.title'), + question: _('confirm-delete-file-attribute.warning'), + confirmationText: _('confirm-delete-file-attribute.delete'), + denyText: _('confirm-delete-file-attribute.cancel'), + titleColor: TitleColors.WARN, + checkboxes: [ + { + value: false, + label: 'confirm-delete-file-attribute.file-impacted-documents', + }, + { value: false, label: 'confirm-delete-file-attribute.file-lost-details' }, + ], + toastMessage: _('confirm-delete-file-attribute.toast-error'), + translateParams: { reportsCount: uniqueTemplates.length, count: attributes.length, name: attributes[0].label }, + }); + if (templates.length) { + data.checkboxes.push({ + value: false, + label: _('confirm-delete-file-attribute.impacted-report'), + extraContent: impactedTemplatesRef, + extraContentData: { templates: uniqueTemplates }, + }); + } + this.openDialog('confirm', $event, data, async () => { + await cb(); + }); + } + + private _getUsersDossiersCount(userIds: string[]): number { + return this._activeDossiersService.all.filter(dw => userIds.reduce((prev, userId) => prev || dw.memberIds.includes(userId), false)) + .length; + } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html deleted file mode 100644 index a076d6010..000000000 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html +++ /dev/null @@ -1,32 +0,0 @@ -
-
- -
-
- - - -
- -
-
-
- - - {{ checkbox.label | translate }} - -
- -
- -
-
- -
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss deleted file mode 100644 index 1cbdb4e5b..000000000 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.scss +++ /dev/null @@ -1,13 +0,0 @@ -@use 'variables'; - -.dialog-header { - color: variables.$primary; -} - -mat-checkbox { - width: 100%; - - &:not(:last-of-type) { - margin-bottom: 6px; - } -} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts deleted file mode 100644 index 95df1236c..000000000 --- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { LoadingService, Toaster } from '@iqser/common-ui'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { firstValueFrom } from 'rxjs'; -import { Dossier } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; -import { Router } from '@angular/router'; - -@Component({ - templateUrl: './confirm-archive-dossier-dialog.component.html', - styleUrls: ['./confirm-archive-dossier-dialog.component.scss'], -}) -export class ConfirmArchiveDossierDialogComponent { - readonly checkboxes = [{ value: false, label: _('confirm-archive-dossier.checkbox.documents') }]; - showToast = false; - - constructor( - private readonly _loadingService: LoadingService, - private readonly _activeDossiersService: ActiveDossiersService, - private readonly _archivedDossiersService: ArchivedDossiersService, - private readonly _toaster: Toaster, - private readonly _router: Router, - @Inject(MAT_DIALOG_DATA) readonly dossier: Dossier, - readonly dialogRef: MatDialogRef, - ) {} - - get valid() { - return this.checkboxes[0].value; - } - - async archiveDossier() { - if (this.valid) { - this._loadingService.start(); - await firstValueFrom(this._archivedDossiersService.archive([this.dossier])); - await this._router.navigate(['main', 'dossiers']); - this._toaster.success(_('dossier-listing.archive.archive-succeeded'), { params: this.dossier }); - this.dialogRef.close(true); - this._loadingService.stop(); - } else { - this.showToast = true; - } - } - - cancel() { - this.dialogRef.close(); - } -} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index c169b60ed..ac4c9a880 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -8,7 +8,7 @@ import { PermissionsService } from '@services/permissions.service'; import { Router } from '@angular/router'; import { MatDialogRef } from '@angular/material/dialog'; import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; -import { ConfirmationDialogInput, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; +import { ConfirmationDialogInput, ConfirmOptions, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; @@ -18,6 +18,7 @@ import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { TranslateService } from '@ngx-translate/core'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; @Component({ selector: 'redaction-edit-dossier-general-info', @@ -49,6 +50,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti private readonly _toaster: Toaster, private readonly _loadingService: LoadingService, private readonly _translateService: TranslateService, + private readonly _archivedDossiersService: ArchivedDossiersService, ) {} get changed(): boolean { @@ -128,7 +130,6 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti title: _('confirmation-dialog.delete-dossier.title'), titleColor: TitleColors.WARN, question: _('confirmation-dialog.delete-dossier.question'), - // details: _('confirmation-dialog.delete-dossier.details'), confirmationText: _('confirmation-dialog.delete-dossier.confirmation-text'), requireInput: true, denyText: _('confirmation-dialog.delete-dossier.deny-text'), @@ -148,8 +149,26 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti } archiveDossier() { - this._dialogService.openDialog('archiveDossier', null, this.dossier, () => { - this._editDossierDialogRef.close(); + const data = new ConfirmationDialogInput({ + title: _('confirm-archive-dossier.title'), + details: _('confirm-archive-dossier.details'), + question: _('confirm-archive-dossier.warning'), + confirmationText: _('confirm-archive-dossier.archive'), + denyText: _('confirm-archive-dossier.cancel'), + titleColor: TitleColors.WARN, + translateParams: { ...this.dossier }, + checkboxes: [{ value: false, label: _('confirm-archive-dossier.checkbox.documents') }], + toastMessage: _('confirm-archive-dossier.toast-error'), + }); + this._dialogService.openDialog('confirm', null, data, async result => { + if (result === ConfirmOptions.CONFIRM) { + this._loadingService.start(); + await firstValueFrom(this._archivedDossiersService.archive([this.dossier])); + await this._router.navigate(['main', 'dossiers']); + this._toaster.success(_('dossier-listing.archive.archive-succeeded'), { params: this.dossier }); + this._editDossierDialogRef.close(); + this._loadingService.stop(); + } }); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts index 70d9ae838..d24609b47 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; -import { DossierStats, StatusSorter } from '../../../../../../../../../../libs/red-domain/src'; +import { DossierStats, StatusSorter } from '@red/domain'; import { List, StatusBarConfig } from '@iqser/common-ui'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts index a1e8ab953..784cf8aa7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts @@ -12,7 +12,7 @@ import { AnnotationReferencesService } from './services/annotation-references.se import { FilterService } from '@iqser/common-ui'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; import { AnnotationProcessingService } from '../../services/annotation-processing.service'; -import { dossiersServiceProvider } from '../../../../services/entity-services/dossiers.service.provider'; +import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; export const filePreviewScreenProviders = [ FilterService, 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 dec3e5aad..ef21f787d 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 @@ -49,7 +49,7 @@ import { FilePreviewStateService } from './services/file-preview-state.service'; import { FileDataModel } from '../../../../models/file/file-data.model'; import { filePreviewScreenProviders } from './file-preview-providers'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; -import { DossiersService } from '../../../../services/entity-services/dossiers.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; import Annotation = Core.Annotations.Annotation; import PDFNet = Core.PDFNet; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index b8ced6c25..9f2dc9551 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -10,7 +10,7 @@ import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; import { SkippedService } from './skipped.service'; import { firstValueFrom } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { DossiersService } from '../../../../../services/entity-services/dossiers.service'; +import { DossiersService } from '@services/entity-services/dossiers.service'; import Annotation = Core.Annotations.Annotation; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts index 8f17befc7..9e5d17f5f 100644 --- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts @@ -12,14 +12,12 @@ import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image- import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; import { ResizeAnnotationDialogComponent } from '../dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; import { HighlightActionDialogComponent } from '../screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component'; -import { ConfirmArchiveDossierDialogComponent } from '../dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; type DialogType = | 'confirm' | 'documentInfo' | 'editDossier' | 'addDossier' - | 'archiveDossier' | 'assignFile' | 'recategorizeImage' | 'changeLegalBasis' @@ -48,10 +46,6 @@ export class DossiersDialogService extends DialogService { component: AddDossierDialogComponent, dialogConfig: { width: '900px', autoFocus: true }, }, - archiveDossier: { - component: ConfirmArchiveDossierDialogComponent, - dialogConfig: { disableClose: false }, - }, assignFile: { component: AssignReviewerApproverDialogComponent, dialogConfig: { disableClose: false }, diff --git a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts index 1e48f5758..79bd98056 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts @@ -8,7 +8,6 @@ import { DossiersDialogService } from '../services/dossiers-dialog.service'; import { DocumentInfoDialogComponent } from '../dialogs/document-info-dialog/document-info-dialog.component'; import { EditDossierDialogComponent } from '../dialogs/edit-dossier-dialog/edit-dossier-dialog.component'; import { AddDossierDialogComponent } from '../dialogs/add-dossier-dialog/add-dossier-dialog.component'; -import { ConfirmArchiveDossierDialogComponent } from '../dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component'; import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component'; import { EditDossierGeneralInfoComponent } from '../dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component'; import { EditDossierDownloadPackageComponent } from '../dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component'; @@ -27,12 +26,7 @@ const components = [ EditDossierTeamComponent, EditDossierDeletedDocumentsComponent, ]; -const dialogs = [ - EditDossierDialogComponent, - AddDossierDialogComponent, - ConfirmArchiveDossierDialogComponent, - AssignReviewerApproverDialogComponent, -]; +const dialogs = [EditDossierDialogComponent, AddDossierDialogComponent, AssignReviewerApproverDialogComponent]; const services = [DossiersDialogService, FileAssignService, RedactionImportService]; @NgModule({ diff --git a/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts b/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts index 15e982731..bc1046d9a 100644 --- a/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts +++ b/apps/red-ui/src/app/services/entity-services/file-attributes.service.ts @@ -16,10 +16,6 @@ export class FileAttributesService extends EntitiesService Date: Thu, 3 Mar 2022 22:53:23 +0200 Subject: [PATCH 16/20] Search archived WIP --- apps/red-ui/src/app/app-routing.module.ts | 10 ++++ .../base-screen/base-screen.component.ts | 15 ++++-- apps/red-ui/src/app/guards/dossiers.guard.ts | 21 ++++++-- ...dit-dossier-deleted-documents.component.ts | 2 +- .../dossier/dossiers-routing.module.ts | 5 -- .../app/modules/dossier/dossiers.module.ts | 7 +-- .../dossier-details.component.ts | 2 +- .../dossier-overview/config.service.ts | 2 +- .../dossiers-listing-details.component.ts | 2 +- .../dossiers-listing/config.service.ts | 2 +- .../user-management.component.ts | 2 +- .../search-screen.component.html | 7 ++- .../search-screen.component.scss | 0 .../search-screen/search-screen.component.ts | 48 ++++++++++++++----- .../src/app/modules/search/search.module.ts | 14 ++++++ .../platform-search.service.ts | 20 +++++--- .../app/services/router-history.service.ts | 2 +- .../translations/file-status-translations.ts | 0 apps/red-ui/src/assets/i18n/de.json | 2 +- apps/red-ui/src/assets/i18n/en.json | 3 +- .../src/lib/search/matched-document.ts | 2 + .../red-domain/src/lib/search/search-input.ts | 2 + .../src/lib/search/search-list-item.ts | 2 + .../src/lib/search/search.request.ts | 16 ++++--- 24 files changed, 130 insertions(+), 58 deletions(-) rename apps/red-ui/src/app/modules/{dossier/screens => search}/search-screen/search-screen.component.html (93%) rename apps/red-ui/src/app/modules/{dossier/screens => search}/search-screen/search-screen.component.scss (100%) rename apps/red-ui/src/app/modules/{dossier/screens => search}/search-screen/search-screen.component.ts (74%) create mode 100644 apps/red-ui/src/app/modules/search/search.module.ts rename apps/red-ui/src/app/{modules/dossier => }/translations/file-status-translations.ts (100%) diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 667b37f53..909b4d090 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -67,6 +67,16 @@ const routes: Routes = [ routeGuards: [AuthGuard, RedRoleGuard], }, }, + { + path: 'main/search', + component: BaseScreenComponent, + loadChildren: () => import('./modules/search/search.module').then(m => m.SearchModule), + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, DossiersGuard], + requiredRoles: ['RED_USER', 'RED_MANAGER'], + }, + }, { path: '**', redirectTo: 'main/dossiers', diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index d16e358c5..de080c4e6 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -57,7 +57,12 @@ export class BaseScreenComponent { action: (query): void => this._searchThisDossier(query), }, { - text: this._translateService.instant('search.entire-platform'), + text: this._translateService.instant('search.active-dossiers'), + icon: 'red:enter', + action: (query): void => this._search(query, [], true), + }, + { + text: this._translateService.instant('search.all-dossiers'), icon: 'red:enter', action: (query): void => this._search(query, []), }, @@ -85,7 +90,7 @@ export class BaseScreenComponent { return true; } - const isDossierOverview = routerLink.includes('dossiers') && routerLink.length === 3; + const isDossierOverview = (routerLink.includes('dossiers') || routerLink.includes('archive')) && routerLink.length === 3; return !isDossierOverview; } @@ -93,9 +98,9 @@ export class BaseScreenComponent { return item.name; } - private _search(query: string, dossierIds: string[]) { - const queryParams = { query, dossierIds: dossierIds.join(',') }; - this._router.navigate(['main/dossiers/search'], { queryParams }).then(); + private _search(query: string, dossierIds: string[], onlyActive = false) { + const queryParams = { query, dossierIds: dossierIds.join(','), onlyActive }; + this._router.navigate(['main/search'], { queryParams }).then(); } private _searchThisDossier(query: string) { diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index e870a7b04..84cb937a1 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,16 +1,29 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; -import { firstValueFrom } from 'rxjs'; +import { firstValueFrom, forkJoin } from 'rxjs'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { take } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { - constructor(private readonly _injector: Injector) {} + constructor( + private readonly _injector: Injector, + private readonly _activeDossiersService: ActiveDossiersService, + private readonly _archivedDossiersService: ArchivedDossiersService, + ) {} async canActivate(route: ActivatedRouteSnapshot): Promise { const token: ProviderToken = route.data.dossiersService; - const dossiersService: DossiersService = this._injector.get(token); - await firstValueFrom(dossiersService.loadAll()); + if (token) { + const dossiersService: DossiersService = this._injector.get(token); + await firstValueFrom(dossiersService.loadAll()); + } else { + const services = [this._archivedDossiersService, this._activeDossiersService]; + const loading$ = forkJoin(services.map(service => service.loadAll().pipe(take(1)))); + await firstValueFrom(loading$); + } return true; } } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index 14c3693b9..47ccbb79a 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -22,7 +22,7 @@ import { distinctUntilChanged, map } from 'rxjs/operators'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; -import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../../translations/file-status-translations'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; diff --git a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts index 74723fcf3..5615e188d 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers-routing.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SearchScreenComponent } from './screens/search-screen/search-screen.component'; import { FilePreviewGuard } from '@guards/file-preview.guard'; import { DossierFilesGuard } from '@guards/dossier-files-guard'; import { CompositeRouteGuard } from '@iqser/common-ui'; @@ -9,10 +8,6 @@ import { DOSSIER_ID, FILE_ID } from '@utils/constants'; import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens'; const routes: Routes = [ - { - path: 'search', - component: SearchScreenComponent, - }, { path: `:${DOSSIER_ID}`, canActivate: [CompositeRouteGuard], diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index d28eed19e..94222f209 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -8,15 +8,12 @@ import { DossiersRoutingModule } from './dossiers-routing.module'; import { FileUploadDownloadModule } from '@upload-download/file-upload-download.module'; import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component'; import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; -import { SearchScreenComponent } from './screens/search-screen/search-screen.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { SharedDossiersModule } from './shared/shared-dossiers.module'; import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component'; import { HighlightActionDialogComponent } from './screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component'; import { ColorPickerModule } from 'ngx-color-picker'; -const screens = [SearchScreenComponent]; - const dialogs = [ ManualAnnotationDialogComponent, ForceAnnotationDialogComponent, @@ -27,10 +24,8 @@ const dialogs = [ HighlightActionDialogComponent, ]; -const components = [...screens, ...dialogs]; - @NgModule({ - declarations: [...components], + declarations: [...dialogs], imports: [ CommonModule, SharedModule, diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index 15e995f4f..d041ee93d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -3,7 +3,7 @@ import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/si import { TranslateChartService } from '@services/translate-chart.service'; import { UserService } from '@services/user.service'; import { FilterService, ProgressBarConfigModel, shareLast, Toaster } from '@iqser/common-ui'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; 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 5d5ad670c..bdf5820af 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 @@ -12,7 +12,7 @@ import { WorkflowConfig, } from '@iqser/common-ui'; import { File, IFileAttributeConfig, StatusSorter, WorkflowFileStatus, WorkflowFileStatuses } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { PermissionsService } from '@services/permissions.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 093747465..8e5e32872 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -4,7 +4,7 @@ import { FilterService, mapEach } from '@iqser/common-ui'; import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { combineLatest, Observable } from 'rxjs'; import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; import { TranslateChartService } from '@services/translate-chart.service'; import { filter, map, switchMap } from 'rxjs/operators'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 4e54ab5e5..221a5f10d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -5,7 +5,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { TranslateService } from '@ngx-translate/core'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index'; import { workloadTranslations } from '../../translations/workload-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts index 97df238a6..6d7decb5f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts @@ -3,7 +3,7 @@ import { Dossier, File, StatusBarConfigs, User } from '@red/domain'; import { List, LoadingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; import { FileAssignService } from '../../../../shared/services/file-assign.service'; -import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { UserService } from '@services/user.service'; import { FilesService } from '@services/entity-services/files.service'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.html similarity index 93% rename from apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html rename to apps/red-ui/src/app/modules/search/search-screen/search-screen.component.html index 5c44f4aca..b63970902 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.html @@ -74,8 +74,11 @@ >
-
- {{ item.dossierName }} +
+
+ + {{ item.dossierName }} +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.scss rename to apps/red-ui/src/app/modules/search/search-screen/search-screen.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts similarity index 74% rename from apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts rename to apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index c5acc767d..7638d3f02 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -14,13 +14,14 @@ import { combineLatest, Observable } from 'rxjs'; import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { workflowFileStatusTranslations } from '../../translations/file-status-translations'; +import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { Dossier, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; +import { Dossier, DossierStatuses, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; +import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; @Component({ templateUrl: './search-screen.component.html', @@ -43,8 +44,14 @@ export class SearchScreenComponent extends ListingComponent imp readonly searchResults$ = combineLatest([this._queryChanged, this._filtersChanged$]).pipe( tap(() => this._loadingService.start()), - tap(([query, dossierIds]) => this._updateNavigation(query, dossierIds)), - switchMap(([query, dossierIds]) => this._platformSearchService.search({ query, dossierIds })), + tap(([query, [dossierIds, onlyActive]]) => this._updateNavigation(query, dossierIds, onlyActive)), + switchMap(([query, [dossierIds, onlyActive]]) => + this._platformSearchService.search({ + query, + dossierIds, + dossierStatus: onlyActive ? [] : [DossierStatuses.ACTIVE, DossierStatuses.ARCHIVED], + }), + ), map(searchResult => this._toMatchedDocuments(searchResult)), map(docs => this._toListItems(docs)), tap(result => this.entitiesService.setEntities(result)), @@ -57,6 +64,7 @@ export class SearchScreenComponent extends ListingComponent imp private readonly _activatedRoute: ActivatedRoute, private readonly _loadingService: LoadingService, private readonly _activeDossiersService: ActiveDossiersService, + private readonly _archivedDossiersService: ArchivedDossiersService, readonly routerHistoryService: RouterHistoryService, private readonly _translateService: TranslateService, private readonly _filesMapService: FilesMapService, @@ -71,12 +79,13 @@ export class SearchScreenComponent extends ListingComponent imp const checked = dossierIds.includes(id); return new NestedFilter({ id, label: dossierName, checked }); }; + const allDossiers = [...this._activeDossiersService.all, ...this._archivedDossiersService.all]; const dossierNameFilter: IFilterGroup = { slug: 'dossiers', label: this._translateService.instant('search-screen.filters.by-dossier'), filterceptionPlaceholder: this._translateService.instant('search-screen.filters.search-placeholder'), icon: 'red:folder', - filters: this._activeDossiersService.all.map(dossierToFilter), + filters: allDossiers.map(dossierToFilter), checker: keyChecker('dossierId'), }; this.filterService.addFilterGroups([dossierNameFilter]); @@ -86,6 +95,10 @@ export class SearchScreenComponent extends ListingComponent imp return this._activatedRoute.snapshot.queryParamMap.get('dossierIds').split(','); } + private get _routeOnlyActive(): boolean { + return this._activatedRoute.snapshot.queryParamMap.get('onlyActive') === 'true'; + } + private get _routeQuery(): string { return this._activatedRoute.snapshot.queryParamMap.get('query'); } @@ -98,10 +111,14 @@ export class SearchScreenComponent extends ListingComponent imp ); } - private get _filtersChanged$(): Observable { + private get _filtersChanged$(): Observable<[string[], boolean]> { return this.filterService.filterGroups$.pipe( - map(groups => groups[0].filters.filter(v => v.checked).map(v => v.id)), - startWith(this._routeDossierIds), + map(groups => { + const dossierIds: string[] = groups[0].filters.filter(v => v.checked).map(v => v.id); + // TODO: Only active filter + return [dossierIds, this._routeOnlyActive]; + }), + startWith<[string[], boolean]>([this._routeDossierIds, this._routeOnlyActive]), ); } @@ -110,8 +127,8 @@ export class SearchScreenComponent extends ListingComponent imp this.searchService.searchValue = newQuery ?? ''; } - private _updateNavigation(query?: string, dossierIds?: string[]): Promise { - const queryParams = { query, dossierIds: dossierIds.join(',') }; + private _updateNavigation(query?: string, dossierIds?: string[], onlyActive?: boolean): Promise { + const queryParams = { query, dossierIds: dossierIds.join(','), onlyActive }; return this._router.navigate([], { queryParams, replaceUrl: true }); } @@ -123,24 +140,29 @@ export class SearchScreenComponent extends ListingComponent imp return matchedDocuments.map(document => this._toListItem(document)).filter(value => value); } - private _toListItem({ dossierId, fileId, unmatchedTerms, highlights, score }: IMatchedDocument): ISearchListItem { + private _toListItem({ dossierId, fileId, unmatchedTerms, highlights, score, dossierStatus }: IMatchedDocument): ISearchListItem { const file = this._filesMapService.get(dossierId, fileId); if (!file) { return undefined; } + const dossier = (dossierStatus === DossierStatuses.ARCHIVED ? this._archivedDossiersService : this._activeDossiersService).find( + dossierId, + ); + return { id: fileId, dossierId, + dossierStatus, unmatched: unmatchedTerms || null, highlights, status: file.workflowStatus, assignee: file.assignee, numberOfPages: file.numberOfPages, - dossierName: this._activeDossiersService.find(dossierId).dossierName, + dossierName: dossier.dossierName, filename: file.filename, searchKey: score.toString(), - routerLink: `/main/dossiers/${dossierId}/file/${fileId}`, + routerLink: file.routerLink, }; } } diff --git a/apps/red-ui/src/app/modules/search/search.module.ts b/apps/red-ui/src/app/modules/search/search.module.ts new file mode 100644 index 000000000..7a79b48ab --- /dev/null +++ b/apps/red-ui/src/app/modules/search/search.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SearchScreenComponent } from './search-screen/search-screen.component'; +import { RouterModule } from '@angular/router'; +import { CommonUiModule } from '@iqser/common-ui'; +import { SharedModule } from '../shared/shared.module'; + +const routes = [{ path: '', component: SearchScreenComponent }]; + +@NgModule({ + declarations: [SearchScreenComponent], + imports: [CommonModule, RouterModule.forChild(routes), CommonUiModule, SharedModule], +}) +export class SearchModule {} diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index 920b89753..e8c545c23 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -6,6 +6,8 @@ import { mapTo, switchMap } from 'rxjs/operators'; import { ActiveDossiersService } from './active-dossiers.service'; import { FilesMapService } from './files-map.service'; import { FilesService } from './files.service'; +import { DossiersService } from './dossiers.service'; +import { ArchivedDossiersService } from './archived-dossiers.service'; @Injectable({ providedIn: 'root' }) export class PlatformSearchService extends GenericService { @@ -13,12 +15,13 @@ export class PlatformSearchService extends GenericService { protected readonly _injector: Injector, private readonly _filesService: FilesService, private readonly _activeDossiersService: ActiveDossiersService, + private readonly _archivedDossiersService: ArchivedDossiersService, private readonly _filesMapService: FilesMapService, ) { super(_injector, 'search-v2'); } - search({ dossierIds, query }: ISearchInput): Observable { + search({ dossierIds, query, dossierStatus }: ISearchInput): Observable { if (!query) { return of({ matchedDocuments: [], @@ -32,19 +35,22 @@ export class PlatformSearchService extends GenericService { page: 0, returnSections: false, pageSize: 300, + dossierStatus, }; return this._post(body).pipe(switchMap(searchValue => this._loadMissingFiles$(searchValue))); } - private _loadMissingFiles$(searchResponse: ISearchResponse): Observable { - const documentsOfActiveDossiers = searchResponse.matchedDocuments.filter(document => - this._activeDossiersService.has(document.dossierId), - ); + private _dossiersWithMissingFiles(searchResponse: ISearchResponse, service: DossiersService): Dossier[] { + const documentsOfType = searchResponse.matchedDocuments.filter(document => service.has(document.dossierId)); const fileNotLoaded = ({ dossierId, fileId }: IMatchedDocument) => !this._filesMapService.get(dossierId, fileId); - const dossiersWithNotLoadedFiles = documentsOfActiveDossiers.filter(fileNotLoaded).map(document => document.dossierId); + const dossiersWithNotLoadedFiles = documentsOfType.filter(fileNotLoaded).map(document => document.dossierId); + return Array.from(new Set(dossiersWithNotLoadedFiles)).map(dossierId => service.find(dossierId)); + } - const dossiers = Array.from(new Set(dossiersWithNotLoadedFiles)).map(dossierId => this._activeDossiersService.find(dossierId)); + private _loadMissingFiles$(searchResponse: ISearchResponse): Observable { + const services = [this._activeDossiersService, this._archivedDossiersService]; + const dossiers = services.map(service => this._dossiersWithMissingFiles(searchResponse, service)).flat(); return dossiers.length ? this._loadFilesFor$(dossiers).pipe(mapTo(searchResponse)) : of(searchResponse); } diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts index bbd98d1c2..5e87a8b82 100644 --- a/apps/red-ui/src/app/services/router-history.service.ts +++ b/apps/red-ui/src/app/services/router-history.service.ts @@ -10,7 +10,7 @@ export class RouterHistoryService { constructor(private readonly _router: Router) { this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => { - if (event.url.startsWith('/main/dossiers') && !event.url.includes('/search')) { + if (event.url.startsWith('/main/dossiers')) { this._lastDossiersScreen = event.url; } }); diff --git a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts b/apps/red-ui/src/app/translations/file-status-translations.ts similarity index 100% rename from apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts rename to apps/red-ui/src/app/translations/file-status-translations.ts diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 2dc1c9db5..9becd128f 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1587,7 +1587,7 @@ "table-header": "{length} {length, plural, one{Suchergebnis} other{Suchergebnisse}}" }, "search": { - "entire-platform": "ganze Plattform", + "active-dossiers": "ganze Plattform", "placeholder": "Nach Dokumenten oder Dokumenteninhalt suchen", "this-dossier": "in diesem Dossier" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 8978b6a64..94a13c81c 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1763,7 +1763,8 @@ "table-header": "{length} search {length, plural, one{result} other{results}}" }, "search": { - "entire-platform": "across all dossiers", + "active-dossiers": "documents in active dossiers", + "all-dossiers": "all documents", "placeholder": "Search documents...", "this-dossier": "in this dossier" }, diff --git a/libs/red-domain/src/lib/search/matched-document.ts b/libs/red-domain/src/lib/search/matched-document.ts index e6b8b5f3b..65d41ddce 100644 --- a/libs/red-domain/src/lib/search/matched-document.ts +++ b/libs/red-domain/src/lib/search/matched-document.ts @@ -1,10 +1,12 @@ import { IMatchedSection } from './matched-section'; import { List } from '@iqser/common-ui'; +import { DossierStatus } from '../dossiers'; export interface IMatchedDocument { containsAllMatchedSections?: boolean; dossierId?: string; dossierTemplateId?: string; + dossierStatus?: DossierStatus; fileId?: string; highlights?: { [key: string]: List }; matchedSections?: List; diff --git a/libs/red-domain/src/lib/search/search-input.ts b/libs/red-domain/src/lib/search/search-input.ts index 597b6391f..dc0786951 100644 --- a/libs/red-domain/src/lib/search/search-input.ts +++ b/libs/red-domain/src/lib/search/search-input.ts @@ -1,6 +1,8 @@ import { List } from '@iqser/common-ui'; +import { DossierStatus } from '../dossiers'; export interface ISearchInput { readonly query: string; readonly dossierIds?: List; + readonly dossierStatus?: List; } diff --git a/libs/red-domain/src/lib/search/search-list-item.ts b/libs/red-domain/src/lib/search/search-list-item.ts index 1b5006a56..0091366b8 100644 --- a/libs/red-domain/src/lib/search/search-list-item.ts +++ b/libs/red-domain/src/lib/search/search-list-item.ts @@ -1,7 +1,9 @@ import { IListable, List } from '@iqser/common-ui'; +import { DossierStatus } from '../dossiers'; export interface ISearchListItem extends IListable { readonly dossierId: string; + readonly dossierStatus: DossierStatus; readonly filename: string; readonly assignee: string; readonly unmatched: List | null; diff --git a/libs/red-domain/src/lib/search/search.request.ts b/libs/red-domain/src/lib/search/search.request.ts index 104e9b097..e9ae5c23e 100644 --- a/libs/red-domain/src/lib/search/search.request.ts +++ b/libs/red-domain/src/lib/search/search.request.ts @@ -1,11 +1,13 @@ import { List } from '@iqser/common-ui'; +import { DossierStatus } from '../dossiers'; export interface ISearchRequest { - dossierIds?: List; - dossierTemplateIds?: List; - fileId?: string; - page?: number; - pageSize?: number; - queryString?: string; - returnSections?: boolean; + readonly dossierIds?: List; + readonly dossierTemplateIds?: List; + readonly dossierStatus?: List; + readonly fileId?: string; + readonly page?: number; + readonly pageSize?: number; + readonly queryString?: string; + readonly returnSections?: boolean; } From 8126b1c452711ca6fd8b67d4e314d90365e940b5 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 3 Mar 2022 22:59:14 +0200 Subject: [PATCH 17/20] Auto stash before merge of "RED-3313" and "origin/RED-3313" --- apps/red-ui/src/app/app.module.ts | 4 +- .../notifications/notifications.component.ts | 2 +- .../src/app/guards/dossier-files-guard.ts | 2 +- apps/red-ui/src/app/guards/dossiers.guard.ts | 6 +-- .../src/app/guards/file-preview.guard.ts | 2 +- ...dossier-states-listing-screen.component.ts | 11 +++-- .../admin/services/admin-dialog.service.ts | 2 +- .../table-item/table-item.component.ts | 2 +- .../archived-dossiers-screen.component.ts | 2 +- .../add-dossier-dialog.component.ts | 2 +- ...sign-reviewer-approver-dialog.component.ts | 2 +- .../change-legal-basis-dialog.component.ts | 2 +- .../document-info-dialog.component.ts | 2 +- .../edit-dossier-dictionary.component.ts | 2 +- ...edit-dossier-download-package.component.ts | 2 +- .../edit-dossier-dialog.component.ts | 2 +- .../edit-dossier-team.component.ts | 2 +- .../edit-dossier-general-info.component.ts | 6 +-- .../force-annotation-dialog.component.ts | 2 +- .../manual-annotation-dialog.component.ts | 2 +- .../dossier-details-stats.component.ts | 2 +- .../dossier-details.component.ts | 4 +- ...ossier-overview-screen-header.component.ts | 2 +- .../file-workload/file-workload.component.ts | 2 +- .../dossier-overview-screen.component.ts | 2 +- .../services/bulk-actions.service.ts | 2 +- .../dossiers-listing-actions.component.ts | 2 +- .../dossiers-listing-details.component.ts | 4 +- .../table-item/table-item.component.ts | 2 +- .../dossiers-listing/config.service.ts | 2 +- .../dossiers-listing-screen.component.ts | 2 +- .../user-management.component.ts | 2 +- .../accept-recommendation-dialog.component.ts | 2 +- .../file-preview-screen.component.ts | 2 +- .../services/annotation-actions.service.ts | 2 +- .../services/annotation-draw.service.ts | 2 +- .../services/file-preview-state.service.ts | 2 +- .../services/manual-annotation.service.ts | 2 +- .../file-actions/file-actions.component.ts | 2 +- .../shared/services/file-assign.service.ts | 2 +- .../search-screen/search-screen.component.ts | 4 +- .../dictionary-manager.component.ts | 2 +- .../file-drop/file-drop.component.ts | 2 +- .../src/app/services/breadcrumbs.service.ts | 2 +- .../active-dossiers.service.ts | 4 +- .../archived-dossiers.service.ts | 24 +++++----- .../dossier-stats.service.ts | 2 +- .../dossiers.service.ts | 46 +++++++------------ .../entity-services/dossier-state.service.ts | 2 +- .../dossiers.service.provider.ts | 2 +- .../file-management.service.ts | 2 +- .../services/entity-services/files.service.ts | 2 +- .../platform-search.service.ts | 6 +-- .../entity-services/trash-dossiers.service.ts | 2 +- .../src/app/services/notifications.service.ts | 2 +- .../src/app/services/permissions.service.ts | 2 +- .../src/lib/dossiers/dossier-changes.ts | 11 +++++ libs/red-domain/src/lib/dossiers/index.ts | 1 + 58 files changed, 112 insertions(+), 109 deletions(-) rename apps/red-ui/src/app/services/{entity-services => dossiers}/active-dossiers.service.ts (86%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/archived-dossiers.service.ts (61%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/dossier-stats.service.ts (94%) rename apps/red-ui/src/app/services/{entity-services => dossiers}/dossiers.service.ts (82%) create mode 100644 libs/red-domain/src/lib/dossiers/dossier-changes.ts diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index aab790e5a..07bb430b0 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -44,8 +44,8 @@ import { GeneralSettingsService } from '@services/general-settings.service'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; import { UserPreferenceService } from '@services/user-preference.service'; import { UserService } from '@services/user.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader { return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`); diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.ts b/apps/red-ui/src/app/components/notifications/notifications.component.ts index ac364c677..b7e29e505 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.ts +++ b/apps/red-ui/src/app/components/notifications/notifications.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { DatePipe } from '@shared/pipes/date.pipe'; import { UserService } from '@services/user.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { NotificationsService } from '@services/notifications.service'; import { Notification } from '@red/domain'; import { distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index a438ea900..aa805c35d 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -4,7 +4,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom } from 'rxjs'; import { DOSSIER_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts index 84cb937a1..d99289967 100644 --- a/apps/red-ui/src/app/guards/dossiers.guard.ts +++ b/apps/red-ui/src/app/guards/dossiers.guard.ts @@ -1,10 +1,10 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate } from '@angular/router'; import { firstValueFrom, forkJoin } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; import { take } from 'rxjs/operators'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class DossiersGuard implements CanActivate { diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts index 3e12c451f..d858d4295 100644 --- a/apps/red-ui/src/app/guards/file-preview.guard.ts +++ b/apps/red-ui/src/app/guards/file-preview.guard.ts @@ -2,7 +2,7 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../services/dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class FilePreviewGuard implements CanActivate { diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index d21f9a8a8..e503109e0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -10,7 +10,7 @@ import { } from '@iqser/common-ui'; import { DossierState, IDossierState } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; @@ -111,9 +111,12 @@ export class DossierStatesListingScreenComponent extends ListingComponent d.dossierTemplateId === this.#dossierTemplateId); this.#setStatesCount(dossierStates); - this.chartData = dossierStates.map(state => { - return { value: state.dossierCount, label: state.name, key: state.name, color: state.color }; - }); + this.chartData = dossierStates.map(state => ({ + value: state.dossierCount, + label: state.name, + key: state.name, + color: state.color, + })); this.entitiesService.setEntities(dossierStates || []); } catch (e) {} diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 24d471313..aacc5ff12 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -24,7 +24,7 @@ import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier- import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { firstValueFrom, forkJoin } from 'rxjs'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service'; import { UserService } from '../../../services/user.service'; import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain'; import { ReportTemplateService } from '../../../services/report-template.service'; diff --git a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts index 96639f6dd..eb2fb8997 100644 --- a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; import { BehaviorSubject, Observable } from 'rxjs'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service'; import { switchMap } from 'rxjs/operators'; @Component({ diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts index 011f62a2d..1cbc63466 100644 --- a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts +++ b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angul import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../../services/config.service'; import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ArchivedDossiersService } from '../../../../services/dossiers/archived-dossiers.service'; import { Dossier } from '@red/domain'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts index 5f8df2701..ad06870c4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts @@ -5,7 +5,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import * as moment from 'moment'; import { downloadTypesTranslations } from '../../../../translations/download-types-translations'; import { BaseDialogComponent, IconButtonTypes, SaveOptions } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { ReportTemplateService } from '@services/report-template.service'; import { firstValueFrom } from 'rxjs'; 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 0bf590180..b1f7e77b4 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 @@ -6,7 +6,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Dossier, File } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts index d597b8def..d56b46d04 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { PermissionsService } from '@services/permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier } from '@red/domain'; import { BaseDialogComponent } from '@iqser/common-ui'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts index a51c29780..2ba30fdeb 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/document-info-dialog/document-info-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { Dossier, File, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 2716b3510..4cda2fe4c 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -8,7 +8,7 @@ import { CircleButtonTypes, LoadingService, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FormBuilder, FormGroup } from '@angular/forms'; import { firstValueFrom } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-dictionary', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts index 424a7d01d..60a79f93f 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.ts @@ -6,7 +6,7 @@ import { downloadTypesTranslations } from '../../../../../translations/download- import { ReportTemplateService } from '@services/report-template.service'; import { PermissionsService } from '@services/permissions.service'; import { firstValueFrom } from 'rxjs'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-download-package', 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 2c7340499..dafce681c 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 @@ -15,7 +15,7 @@ import { tap } from 'rxjs/operators'; import { EditDossierTeamComponent } from './edit-dossier-team/edit-dossier-team.component'; import { PermissionsService } from '@services/permissions.service'; import { UserService } from '@services/user.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes' | 'deletedDocuments'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts index f51df9547..40c711cde 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts @@ -6,7 +6,7 @@ import { AutoUnsubscribe } from '@iqser/common-ui'; import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; import { PermissionsService } from '@services/permissions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; @Component({ selector: 'redaction-edit-dossier-team', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index ac4c9a880..a8ad313f4 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -11,14 +11,14 @@ import { EditDossierDialogComponent } from '../edit-dossier-dialog.component'; import { ConfirmationDialogInput, ConfirmOptions, IconButtonTypes, LoadingService, TitleColors, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; import { firstValueFrom } from 'rxjs'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { TranslateService } from '@ngx-translate/core'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { TrashDossiersService } from '@services/entity-services/trash-dossiers.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service'; @Component({ selector: 'redaction-edit-dossier-general-info', diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts index ee322806b..074191aa2 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; import { UserService } from '@services/user.service'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; import { PermissionsService } from '@services/permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dossier, ILegalBasisChangeRequest } from '@red/domain'; import { firstValueFrom } from 'rxjs'; diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index cc6f72750..bb43c5f42 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -6,7 +6,7 @@ import { ManualAnnotationService } from '../../services/manual-annotation.servic import { PermissionsService } from '@services/permissions.service'; import { JustificationsService } from '@services/entity-services/justifications.service'; import { Dictionary, Dossier, IAddRedactionRequest } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DictionaryService } from '@shared/services/dictionary.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { firstValueFrom } from 'rxjs'; 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 8861fe27a..915058867 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 @@ -5,7 +5,7 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ import { FilesService } from '@services/entity-services/files.service'; import { firstValueFrom, Observable } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts index d041ee93d..bec608190 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -8,12 +8,12 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain'; import { ActivatedRoute } from '@angular/router'; import { firstValueFrom, Observable } from 'rxjs'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { map, pluck, switchMap } from 'rxjs/operators'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-dossier-details', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts index 15249262c..d66fa681c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts @@ -21,7 +21,7 @@ import { ConfigService } from '../../config.service'; import { firstValueFrom } from 'rxjs'; import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service'; import { Router } from '@angular/router'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-dossier-overview-screen-header', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts index 0bc097f52..3cdfc9623 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { File } from '@red/domain'; import { UserService } from '@services/user.service'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../../../services/dossiers/dossiers.service'; @Component({ selector: 'redaction-file-workload', 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 a4bf07984..2123eb951 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 @@ -44,7 +44,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { FilesService } from '@services/entity-services/files.service'; import { DOSSIER_ID } from '@utils/constants'; import { BulkActionsService } from '../services/bulk-actions.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts index 71ebccdd9..569e424a4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Dossier, File } from '@red/domain'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { FileAssignService } from '../../../shared/services/file-assign.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index 512dfdc9d..42ad618cb 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -8,7 +8,7 @@ import { LongPressEvent } from '@shared/directives/long-press.directive'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { ReanalysisService } from '@services/reanalysis.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { firstValueFrom } from 'rxjs'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts index 8e5e32872..2e89dbae4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts @@ -1,13 +1,13 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { FilterService, mapEach } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { combineLatest, Observable } from 'rxjs'; import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain'; import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations'; import { TranslateChartService } from '@services/translate-chart.service'; import { filter, map, switchMap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; import { TranslateService } from '@ngx-translate/core'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts index 0151c3320..209e5bebf 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { Dossier, DossierStats } from '@red/domain'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 221a5f10d..589db7743 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -9,7 +9,7 @@ import { workflowFileStatusTranslations } from '../../../../translations/file-st import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index'; import { workloadTranslations } from '../../translations/workload-translations'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service'; import { DossierStateService } from '@services/entity-services/dossier-state.service'; @Injectable() 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 c701a66bb..1d78c6fe4 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 @@ -8,7 +8,7 @@ import { DossiersDialogService } from '../../../services/dossiers-dialog.service import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ConfigService } from '../config.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { FilesService } from '@services/entity-services/files.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts index 6d7decb5f..7da635d51 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts @@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, firstValueFrom, Observable, switchMap } from 'rxjs'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; import { distinctUntilChanged, map } from 'rxjs/operators'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; @Component({ selector: 'redaction-user-management', diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts index 73ae1d051..23486c7f9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { PermissionsService } from '@services/permissions.service'; import { Dictionary, Dossier } from '@red/domain'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service'; import { BaseDialogComponent } from '@iqser/common-ui'; import { DictionaryService } from '@shared/services/dictionary.service'; import { ManualAnnotationService } from '../../../../services/manual-annotation.service'; 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 ef21f787d..0d9cb0fc0 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 @@ -49,7 +49,7 @@ import { FilePreviewStateService } from './services/file-preview-state.service'; import { FileDataModel } from '../../../../models/file/file-data.model'; import { filePreviewScreenProviders } from './file-preview-providers'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../services/dossiers/dossiers.service'; import Annotation = Core.Annotations.Annotation; import PDFNet = Core.PDFNet; diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts index 64b334e7e..9678c87ae 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts @@ -14,7 +14,7 @@ import { Dossier, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IR import { toPosition } from '../../../utils/pdf-calculation.utils'; import { AnnotationDrawService } from './annotation-draw.service'; import { translateQuads } from '@utils/pdf-coordinates'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { AcceptRecommendationData, AcceptRecommendationDialogComponent, diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index 9f2dc9551..5f188a944 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -10,7 +10,7 @@ import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain'; import { SkippedService } from './skipped.service'; import { firstValueFrom } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import Annotation = Core.Annotations.Annotation; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index f6053b336..007038d57 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -9,7 +9,7 @@ import { boolFactory, shareLast } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '../../../../../services/dossiers/dossiers.service'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; @Injectable() diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts index e0e7ed10c..99a831e55 100644 --- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts @@ -17,7 +17,7 @@ import { AnnotationActionMode } from '../models/annotation-action-mode.model'; import { annotationActionsTranslations } from '../translations/annotation-actions-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { Observable } from 'rxjs'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 3c1dcde3c..a6d824225 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -28,7 +28,7 @@ import { UserService } from '@services/user.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { LongPressEvent } from '@shared/directives/long-press.directive'; import { FileAssignService } from '../../services/file-assign.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { FilesService } from '@services/entity-services/files.service'; import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service'; diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts index bd4672134..49c61d10e 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts @@ -5,7 +5,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FilesService } from '@services/entity-services/files.service'; import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service'; import { firstValueFrom, Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 7638d3f02..45a760d9d 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -17,11 +17,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { workflowFileStatusTranslations } from '../../../translations/file-status-translations'; import { TranslateService } from '@ngx-translate/core'; import { RouterHistoryService } from '@services/router-history.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; import { Dossier, DossierStatuses, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PlatformSearchService } from '@services/entity-services/platform-search.service'; -import { ArchivedDossiersService } from '@services/entity-services/archived-dossiers.service'; +import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service'; +import { ArchivedDossiersService } from '../../../services/dossiers/archived-dossiers.service'; @Component({ templateUrl: './search-screen.component.html', diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index c662e3a2c..e8d4ea708 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -5,7 +5,7 @@ import { catchError, map, take, tap } from 'rxjs/operators'; import { Dictionary, Dossier, DossierTemplate } from '@red/domain'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DictionaryService } from '@shared/services/dictionary.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { EditorComponent } from '@shared/components/editor/editor.component'; import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service'; 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 856066818..29b4dc609 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 @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, HostListener, Inject } from '@angular/cor import { FileUploadService } from '../services/file-upload.service'; import { OverlayRef } from '@angular/cdk/overlay'; import { StatusOverlayService } from '../services/status-overlay.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { handleFileDrop } from '@utils/file-drop-utils'; import { FileUploadModel } from '@upload-download/model/file-upload.model'; import { DOSSIER_ID } from '../../../tokens'; diff --git a/apps/red-ui/src/app/services/breadcrumbs.service.ts b/apps/red-ui/src/app/services/breadcrumbs.service.ts index 6679e7255..16f90f59d 100644 --- a/apps/red-ui/src/app/services/breadcrumbs.service.ts +++ b/apps/red-ui/src/app/services/breadcrumbs.service.ts @@ -7,7 +7,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service'; import { TranslateService } from '@ngx-translate/core'; import { BreadcrumbTypes } from '@red/domain'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; export type RouterLinkActiveOptions = { exact: boolean } | IsActiveMatchOptions; diff --git a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts similarity index 86% rename from apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts index b252b43d2..af72b2eb5 100644 --- a/apps/red-ui/src/app/services/entity-services/active-dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/active-dossiers.service.ts @@ -1,8 +1,8 @@ import { Injectable, Injector } from '@angular/core'; import { switchMap, tap } from 'rxjs/operators'; import { timer } from 'rxjs'; -import { CHANGED_CHECK_INTERVAL } from '@utils/constants'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { CHANGED_CHECK_INTERVAL } from '../../utils/constants'; +import { DossiersService } from './dossiers.service'; export interface IDossiersStats { totalPeople: number; diff --git a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts similarity index 61% rename from apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts index c94679864..75ae0b05c 100644 --- a/apps/red-ui/src/app/services/entity-services/archived-dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts @@ -4,8 +4,8 @@ import { catchError, tap } from 'rxjs/operators'; import { Observable, of } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { ActiveDossiersService } from './active-dossiers.service'; -import { DossiersService } from '@services/entity-services/dossiers.service'; -import { FilesMapService } from '@services/entity-services/files-map.service'; +import { DossiersService } from './dossiers.service'; +import { FilesMapService } from '../entity-services/files-map.service'; @Injectable({ providedIn: 'root' }) export class ArchivedDossiersService extends DossiersService { @@ -18,22 +18,22 @@ export class ArchivedDossiersService extends DossiersService { } archive(dossiers: Dossier[]): Observable { - const showToast = () => { + const showArchiveFailedToast = () => { this._toaster.error(_('dossier-listing.archive.archive-failed'), { params: dossiers }); return of({}); }; - return this._post( - dossiers.map(d => d.id), - `${this._defaultModelPath}/archive`, - ).pipe( - tap(() => this.#removeFromActiveDossiers(dossiers)), - catchError(showToast), + + const archivedDossiersIds = dossiers.map(d => d.dossierId); + + return this._post(archivedDossiersIds, `${this._defaultModelPath}/archive`).pipe( + tap(() => this.#removeFromActiveDossiers(archivedDossiersIds)), + catchError(showArchiveFailedToast), ); } - #removeFromActiveDossiers(dossiers: Dossier[]): void { - const remainingEntities = this._activeDossiersService.all.filter(dossier => !dossiers.find(d => dossier.id === d.id)); + #removeFromActiveDossiers(archivedDossiersIds: string[]): void { + const remainingEntities = this._activeDossiersService.all.filter(d => !archivedDossiersIds.includes(d.dossierId)); this._activeDossiersService.setEntities(remainingEntities); - this._filesMapService.delete(dossiers.map(d => d.id)); + this._filesMapService.delete(archivedDossiersIds); } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts b/apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts similarity index 94% rename from apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts rename to apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts index 52085cd92..aa244511b 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-stats.service.ts +++ b/apps/red-ui/src/app/services/dossiers/dossier-stats.service.ts @@ -3,7 +3,7 @@ import { StatsService } from '@iqser/common-ui'; import { DossierStats, IDossierStats } from '@red/domain'; import { DOSSIER_ID } from '@utils/constants'; import { Observable, of } from 'rxjs'; -import { UserService } from '@services/user.service'; +import { UserService } from '../user.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts similarity index 82% rename from apps/red-ui/src/app/services/entity-services/dossiers.service.ts rename to apps/red-ui/src/app/services/dossiers/dossiers.service.ts index 16b9cb57e..ad2c166b4 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/dossiers/dossiers.service.ts @@ -1,26 +1,14 @@ import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; -import { Dossier, DossierStats, IDossier, IDossierRequest } from '@red/domain'; -import { combineLatest, forkJoin, Observable, of, Subject, throwError } from 'rxjs'; +import { Dossier, DossierStats, IChangesDetails, IDossier, IDossierChanges, IDossierRequest } from '@red/domain'; +import { combineLatest, EMPTY, forkJoin, Observable, of, Subject, throwError } from 'rxjs'; import { catchError, filter, map, mapTo, pluck, switchMap, tap } from 'rxjs/operators'; import { Injector } from '@angular/core'; -import { DossierStateService } from './dossier-state.service'; +import { DossierStateService } from '../entity-services/dossier-state.service'; import { DossierStatsService } from './dossier-stats.service'; -import { IDossiersStats } from '@services/entity-services/active-dossiers.service'; +import { IDossiersStats } from './active-dossiers.service'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -interface DossierChange { - readonly dossierChanges: boolean; - readonly dossierId: string; - readonly fileChanges: boolean; -} - -type DossierChanges = readonly DossierChange[]; - -interface ChangesDetails { - readonly dossierChanges: DossierChanges; -} - const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); @@ -36,10 +24,10 @@ export abstract class DossiersService extends EntitiesService } @Validate() - createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { + createOrUpdate(@RequiredParam() dossier: IDossierRequest): Observable { const showToast = (error: HttpErrorResponse) => { this._toaster.error(error.status === HttpStatusCode.Conflict ? DOSSIER_EXISTS_MSG : GENERIC_MSG); - return of(undefined); + return EMPTY; }; return this._post(dossier, 'dossier').pipe( @@ -48,7 +36,7 @@ export abstract class DossiersService extends EntitiesService ); } - loadOnlyChanged(): Observable { + loadOnlyChanged(): Observable { const removeIfNotFound = (id: string) => catchError((error: HttpErrorResponse) => { if (error.status === HttpStatusCode.NotFound) { @@ -58,23 +46,15 @@ export abstract class DossiersService extends EntitiesService return throwError(() => error); }); - const load = (changes: DossierChanges) => + const load = (changes: IDossierChanges) => changes.map(change => this._load(change.dossierId).pipe(removeIfNotFound(change.dossierId))); return this.hasChangesDetails$().pipe( - pluck('dossierChanges'), switchMap(dossierChanges => forkJoin(load(dossierChanges)).pipe(mapTo(dossierChanges))), tap(() => this._updateLastChanged()), ); } - hasChangesDetails$(): Observable { - const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; - return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( - filter(changes => changes.dossierChanges.length > 0), - ); - } - loadAll(): Observable { const dossierIds = (dossiers: Dossier[]) => dossiers.map(d => d.id); return this.getAll().pipe( @@ -86,7 +66,15 @@ export abstract class DossiersService extends EntitiesService ); } - protected _emitFileChanges(dossierChanges: DossierChanges): void { + hasChangesDetails$(): Observable { + const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; + return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( + filter(changes => changes.dossierChanges.length > 0), + pluck('dossierChanges'), + ); + } + + protected _emitFileChanges(dossierChanges: IDossierChanges): void { dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts index e3c3fb7bd..373eca825 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts @@ -27,7 +27,7 @@ export class DossierStateService extends EntitiesService template.dossierTemplateId), mapEach(id => this.loadAllForTemplate(id)), - switchMap(all => forkJoin(all).pipe(defaultIfEmpty([]))), + switchMap(all => forkJoin(all).pipe(defaultIfEmpty([] as DossierState[][]))), map(value => value.flatMap(item => item)), tap(value => this.setEntities(value)), ); diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts index 20f342608..0b176f0d7 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.provider.ts @@ -1,6 +1,6 @@ import { ActivatedRoute } from '@angular/router'; import { Injector, ProviderToken } from '@angular/core'; -import { DossiersService } from './dossiers.service'; +import { DossiersService } from '../dossiers/dossiers.service'; export const dossiersServiceResolver = (injector: Injector) => { const route = injector.get(ActivatedRoute); diff --git a/apps/red-ui/src/app/services/entity-services/file-management.service.ts b/apps/red-ui/src/app/services/entity-services/file-management.service.ts index 300ec08b1..a58b8ad5a 100644 --- a/apps/red-ui/src/app/services/entity-services/file-management.service.ts +++ b/apps/red-ui/src/app/services/entity-services/file-management.service.ts @@ -4,7 +4,7 @@ import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { FilesService } from '@services/entity-services/files.service'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/services/entity-services/files.service.ts b/apps/red-ui/src/app/services/entity-services/files.service.ts index f67a969e7..6d76d9d1f 100644 --- a/apps/red-ui/src/app/services/entity-services/files.service.ts +++ b/apps/red-ui/src/app/services/entity-services/files.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { UserService } from '../user.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { map, mapTo, switchMap, tap } from 'rxjs/operators'; -import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; +import { DossierStatsService } from '@services/dossiers/dossier-stats.service'; @Injectable({ providedIn: 'root', diff --git a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts index e8c545c23..abda973f3 100644 --- a/apps/red-ui/src/app/services/entity-services/platform-search.service.ts +++ b/apps/red-ui/src/app/services/entity-services/platform-search.service.ts @@ -3,11 +3,11 @@ import { GenericService } from '@iqser/common-ui'; import { Dossier, IMatchedDocument, ISearchInput, ISearchRequest, ISearchResponse } from '@red/domain'; import { Observable, of, zip } from 'rxjs'; import { mapTo, switchMap } from 'rxjs/operators'; -import { ActiveDossiersService } from './active-dossiers.service'; +import { ActiveDossiersService } from '../dossiers/active-dossiers.service'; import { FilesMapService } from './files-map.service'; import { FilesService } from './files.service'; -import { DossiersService } from './dossiers.service'; -import { ArchivedDossiersService } from './archived-dossiers.service'; +import { ArchivedDossiersService } from '../dossiers/archived-dossiers.service'; +import { DossiersService } from '../dossiers/dossiers.service'; @Injectable({ providedIn: 'root' }) export class PlatformSearchService extends GenericService { diff --git a/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts index a1ebc5a88..158ff48d5 100644 --- a/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/trash-dossiers.service.ts @@ -7,7 +7,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import * as moment from 'moment'; import { ConfigService } from '../config.service'; import { PermissionsService } from '../permissions.service'; -import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service'; +import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; export interface IDossiersStats { totalPeople: number; diff --git a/apps/red-ui/src/app/services/notifications.service.ts b/apps/red-ui/src/app/services/notifications.service.ts index a37192934..f47cce9c5 100644 --- a/apps/red-ui/src/app/services/notifications.service.ts +++ b/apps/red-ui/src/app/services/notifications.service.ts @@ -7,7 +7,7 @@ import { INotification, Notification, NotificationTypes } from '@red/domain'; import { map, switchMap } from 'rxjs/operators'; import { notificationsTranslations } from '../translations/notifications-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { ActiveDossiersService } from './entity-services/active-dossiers.service'; +import { ActiveDossiersService } from './dossiers/active-dossiers.service'; import { UserService } from '@services/user.service'; import { FilesMapService } from '@services/entity-services/files-map.service'; diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index ae6a1005c..6d99dab1b 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector } from '@angular/core'; import { UserService } from './user.service'; import { Dossier, File, IComment, IDossier } from '@red/domain'; -import { DossiersService } from '@services/entity-services/dossiers.service'; +import { DossiersService } from '@services/dossiers/dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider'; import { FilesMapService } from '@services/entity-services/files-map.service'; diff --git a/libs/red-domain/src/lib/dossiers/dossier-changes.ts b/libs/red-domain/src/lib/dossiers/dossier-changes.ts new file mode 100644 index 000000000..a63406f4c --- /dev/null +++ b/libs/red-domain/src/lib/dossiers/dossier-changes.ts @@ -0,0 +1,11 @@ +export interface IDossierChange { + readonly dossierChanges: boolean; + readonly dossierId: string; + readonly fileChanges: boolean; +} + +export type IDossierChanges = readonly IDossierChange[]; + +export interface IChangesDetails { + readonly dossierChanges: IDossierChanges; +} diff --git a/libs/red-domain/src/lib/dossiers/index.ts b/libs/red-domain/src/lib/dossiers/index.ts index 5f42d97f7..994f4274c 100644 --- a/libs/red-domain/src/lib/dossiers/index.ts +++ b/libs/red-domain/src/lib/dossiers/index.ts @@ -2,3 +2,4 @@ export * from './dossier'; export * from './dossier.request'; export * from './dossier.model'; export * from './types'; +export * from './dossier-changes'; From 346baaf7ec7b87aebb4b68ec0e3c5df7c11e7120 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 4 Mar 2022 17:43:09 +0200 Subject: [PATCH 18/20] add only active dossiers filter --- ...dit-dossier-deleted-documents.component.ts | 2 +- .../search-screen/search-screen.component.ts | 11 +++++--- .../src/app/modules/shared/pipes/date.pipe.ts | 26 ++++++++++--------- apps/red-ui/src/app/utils/functions.ts | 17 ------------ apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + libs/common-ui | 2 +- .../lib/trash-dossier/trash-dossier.model.ts | 5 ++-- 8 files changed, 27 insertions(+), 38 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index 47ccbb79a..3f6b69cde 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -5,6 +5,7 @@ import { CircleButtonTypes, ConfirmationDialogInput, DefaultListingServices, + getLeftDateTime, IListable, IRouterPath, ListingComponent, @@ -16,7 +17,6 @@ import { import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import * as moment from 'moment'; import { ConfigService } from '@services/config.service'; -import { getLeftDateTime } from '@utils/functions'; import { firstValueFrom, Observable, of } from 'rxjs'; import { distinctUntilChanged, map } from 'rxjs/operators'; import { DossiersDialogService } from '../../../services/dossiers-dialog.service'; diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 45a760d9d..0fae5de35 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -89,6 +89,8 @@ export class SearchScreenComponent extends ListingComponent imp checker: keyChecker('dossierId'), }; this.filterService.addFilterGroups([dossierNameFilter]); + const onlyActiveLabel = this._translateService.instant('search-screen.filters.only-active'); + this.filterService.addSingleFilter({ id: 'onlyActiveDossiers', label: onlyActiveLabel, checked: this._routeOnlyActive }); } private get _routeDossierIds(): string[] { @@ -112,11 +114,12 @@ export class SearchScreenComponent extends ListingComponent imp } private get _filtersChanged$(): Observable<[string[], boolean]> { - return this.filterService.filterGroups$.pipe( - map(groups => { + const onlyActiveDossiers$ = this.filterService.getSingleFilter('onlyActiveDossiers').pipe(map(f => !!f.checked)); + const filterGroups$ = this.filterService.filterGroups$; + return combineLatest([filterGroups$, onlyActiveDossiers$]).pipe( + map(([groups, onlyActive]) => { const dossierIds: string[] = groups[0].filters.filter(v => v.checked).map(v => v.id); - // TODO: Only active filter - return [dossierIds, this._routeOnlyActive]; + return [dossierIds, onlyActive]; }), startWith<[string[], boolean]>([this._routeDossierIds, this._routeOnlyActive]), ); diff --git a/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts b/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts index b2a1364ee..10734a943 100644 --- a/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts +++ b/apps/red-ui/src/app/modules/shared/pipes/date.pipe.ts @@ -3,9 +3,9 @@ import * as moment from 'moment'; import { TranslateService } from '@ngx-translate/core'; import { DatePipe as BaseDatePipe } from '@angular/common'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { getLeftDateTime } from '@utils/functions'; +import { getLeftDateTime } from '@iqser/common-ui'; -const MONTH_NAMES = { +const MONTH_NAMES: Record = { 0: _('months.jan'), 1: _('months.feb'), 2: _('months.mar'), @@ -29,16 +29,18 @@ export class DatePipe extends BaseDatePipe implements PipeTransform { } transform(value: null | undefined, format?: string, timezone?: string, locale?: string): null; - transform(value: Date | string | number | null | undefined, format?: string, timezone?: string, locale?: string): string | null; - transform(value: any, format?: string, timezone?: string, locale?: string): string { - if (format === 'timeFromNow') { - return this._getTimeFromNow(value); - } - if (format === 'sophisticatedDate') { - return this._getSophisticatedDate(value); - } - if (format === 'exactDate') { - return this._getExactDate(value); + transform(value: Date | string | number, format?: string, timezone?: string, locale?: string): string; + transform(value: Date | string | number | null | undefined, format?: string, timezone?: string, locale?: string): string | null { + if (typeof value === 'string') { + if (format === 'timeFromNow') { + return this._getTimeFromNow(value); + } + if (format === 'sophisticatedDate') { + return this._getSophisticatedDate(value); + } + if (format === 'exactDate') { + return this._getExactDate(value); + } } return super.transform(value, format, timezone, locale); } diff --git a/apps/red-ui/src/app/utils/functions.ts b/apps/red-ui/src/app/utils/functions.ts index 68c6210f9..daeeb56d2 100644 --- a/apps/red-ui/src/app/utils/functions.ts +++ b/apps/red-ui/src/app/utils/functions.ts @@ -1,4 +1,3 @@ -import * as moment from 'moment'; import { List } from '@iqser/common-ui'; import { filter } from 'rxjs/operators'; import { ActivationEnd } from '@angular/router'; @@ -76,22 +75,6 @@ export function toNumber(str: string) { } } -const HOURS_IN_A_DAY = 24; -const MINUTES_IN_AN_HOUR = 60; - -export function getLeftDateTime(ISOString: string) { - const date = moment(ISOString); - const now = new Date(Date.now()); - - const daysLeft = date.diff(now, 'days'); - const hoursFromNow = date.diff(now, 'hours'); - const hoursLeft = hoursFromNow - HOURS_IN_A_DAY * daysLeft; - const minutesFromNow = date.diff(now, 'minutes'); - const minutesLeft = minutesFromNow - HOURS_IN_A_DAY * MINUTES_IN_AN_HOUR * daysLeft; - - return { daysLeft, hoursLeft, minutesLeft }; -} - export function removeBraces(str: any): string { return str.replace(/[{}]/g, ''); } diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 6eda98a9e..1b163e726 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1719,6 +1719,7 @@ }, "filters": { "by-dossier": "Nach Dossier filtern", + "only-active": "", "search-placeholder": "Dossiername..." }, "missing": "Fehlt", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index b9aa96abd..afb9cf4a0 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1754,6 +1754,7 @@ }, "filters": { "by-dossier": "Filter by Dossier", + "only-active": "Active dossiers only", "search-placeholder": "Dossier name..." }, "missing": "Missing", diff --git a/libs/common-ui b/libs/common-ui index 0157507f6..c11f73ba9 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 0157507f661ab216413ec0cf6f4a03128ecb5fce +Subproject commit c11f73ba9e202ae86e60a6e6eb1639a3a59d04a8 diff --git a/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts b/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts index 0988653f1..aca8adf9d 100644 --- a/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts +++ b/libs/red-domain/src/lib/trash-dossier/trash-dossier.model.ts @@ -1,7 +1,6 @@ -import { List } from '@iqser/common-ui'; +import { getLeftDateTime, List } from '@iqser/common-ui'; import { DownloadFileType } from '../shared'; -import { DossierStatus, IDossier } from '@red/domain'; -import { getLeftDateTime } from '@utils/functions'; +import { DossierStatus, IDossier } from '../dossiers'; export class TrashDossier implements IDossier { readonly dossierId: string; From 3e692767344522ab42919370498e2e071a6e162b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 8 Mar 2022 16:49:39 +0200 Subject: [PATCH 19/20] Search minor fixes --- .../src/app/components/base-screen/base-screen.component.ts | 2 +- libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts index de080c4e6..eea8ce8fc 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.ts @@ -19,7 +19,7 @@ interface MenuItem { } const isNavigationStart = event => event instanceof NavigationStart; -const isSearchScreen: (url: string) => boolean = url => url.includes('/main/dossiers') && url.includes('/search'); +const isSearchScreen: (url: string) => boolean = url => url.includes('/search'); @Component({ templateUrl: './base-screen.component.html', diff --git a/libs/common-ui b/libs/common-ui index 2bae4da2b..903a6288d 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 2bae4da2b991ad300b893f6b73797b6c1b90448c +Subproject commit 903a6288deb66d865974a13bd03adf27c73070a2 From b90b1168b10e9e298dd887bbbf9e3a6efb20d6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 8 Mar 2022 17:05:53 +0200 Subject: [PATCH 20/20] Disable some actions for archived dossiers --- .../dossier-states-listing-screen.component.ts | 5 +++-- .../screen/dossier-overview-screen.component.ts | 4 +++- .../app/services/entity-services/dossier-state.service.ts | 2 +- apps/red-ui/src/app/services/permissions.service.ts | 5 ++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index e503109e0..8c34f7811 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -16,7 +16,7 @@ import { firstValueFrom } from 'rxjs'; import { AdminDialogService } from '../../services/admin-dialog.service'; import { UserService } from '@services/user.service'; import { HttpStatusCode } from '@angular/common/http'; -import { DoughnutChartConfig } from '../../../shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; +import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; import { ActivatedRoute } from '@angular/router'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; @@ -93,7 +93,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent { this._loadingService.start(); - await firstValueFrom(this.dossierStateService.setDossierState(newValue)).catch(error => { + await firstValueFrom(this.dossierStateService.updateDossierState(newValue)).catch(error => { if (error.status === HttpStatusCode.Conflict) { this._toaster.error(_('dossier-states-listing.error.conflict')); } else { @@ -106,6 +106,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent { this._loadingService.start(); + // TODO: Move this in service; dossiers states service should be a mapping service await firstValueFrom(this._activeDossiersService.loadAll()); try { 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 2123eb951..f586fca22 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 @@ -133,7 +133,9 @@ export class DossierOverviewScreenComponent extends ListingComponent imple ) .subscribe(); - this._fileDropOverlayService.initFileDropHandling(this.dossierId); + if (this.currentDossier.isActive) { + this._fileDropOverlayService.initFileDropHandling(this.dossierId); + } this.addSubscription = this.configService.listingMode$.subscribe(() => { this._computeAllFilters(); diff --git a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts index 373eca825..cfe8f536a 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts @@ -14,7 +14,7 @@ export class DossierStateService extends EntitiesService(body, this._defaultModelPath); } diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 3268961fc..befafdb3f 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -38,7 +38,10 @@ export class PermissionsService { canEditFileAttributes(file: File): boolean { const dossier = this._getDossier(file); - return ((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier)); + return ( + this._isActive(file) && + (((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier))) + ); } canToggleAnalysis(file: File | File[]): boolean {