+
{{ dossierStats.numberOfPages }}
diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts
index d65488e93..710f5fdfc 100644
--- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts
@@ -1,17 +1,18 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { DossierStats } from '@red/domain';
+import { Dossier, DossierStats } from '@red/domain';
import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
import * as moment from 'moment';
import { List } from '@iqser/common-ui';
const DUE_DATE_WARN_DAYS = 14;
-interface PartialDossier {
+interface PartialDossier extends Partial
{
readonly dossierName: string;
readonly dossierTemplateId: string;
readonly dueDate?: string;
readonly date?: string;
readonly memberIds: List;
+ readonly isSoftDeleted: boolean;
}
@Component({
diff --git a/apps/red-ui/src/app/services/entity-services/trash.service.ts b/apps/red-ui/src/app/services/entity-services/trash.service.ts
index c9d968106..b8dc6ad17 100644
--- a/apps/red-ui/src/app/services/entity-services/trash.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/trash.service.ts
@@ -73,8 +73,7 @@ export class TrashService extends GenericService {
this._permissionsService.canDeleteDossier(dossier),
),
),
- // TODO: API to include deleted dossiers
- // switchMap(dossiers => this._dossierStatsService.getFor(dossiers.map(d => d.id)).pipe(mapTo(dossiers))),
+ switchMap(dossiers => this._dossierStatsService.getFor(dossiers.map(d => d.id) as string[]).pipe(map(() => dossiers))),
);
}
diff --git a/libs/common-ui b/libs/common-ui
index a6c4093d3..8a992aa44 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit a6c4093d3553c4d0f95e496678e2a8f1cab0b9de
+Subproject commit 8a992aa440ff24d1244e24edea3ce75fdadbebd5
diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts
index fba166c8a..b0e04911a 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.model.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts
@@ -64,6 +64,10 @@ export class Dossier implements IDossier, IListable, IRouterPath {
return this.status === DossierStatuses.ACTIVE;
}
+ get isSoftDeleted(): boolean {
+ return this.status === DossierStatuses.DELETED;
+ }
+
hasMember(memberId: string): boolean {
return !!this.memberIds && this.memberIds.indexOf(memberId) >= 0;
}
diff --git a/libs/red-domain/src/lib/trash/trash-dossier.model.ts b/libs/red-domain/src/lib/trash/trash-dossier.model.ts
index c26d101de..7cd317f11 100644
--- a/libs/red-domain/src/lib/trash/trash-dossier.model.ts
+++ b/libs/red-domain/src/lib/trash/trash-dossier.model.ts
@@ -6,6 +6,8 @@ export class TrashDossier extends TrashItem {
readonly type = 'dossier';
readonly icon = 'red:folder';
+ readonly isSoftDeleted = true;
+
readonly dossierId: string;
readonly dossierTemplateId: string;
readonly dossierName: string;