From 9a85d54990d43de75e420e376ac0464c652f829c Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Wed, 6 Oct 2021 16:23:07 +0300
Subject: [PATCH] cast objects, find bugs

---
 .../downloads-list-screen.component.html      |  4 +-
 .../active-fields-listing.component.html      |  4 +-
 .../screens/audit/audit-screen.component.html |  4 +-
 .../default-colors-screen.component.html      |  4 +-
 .../dictionary-listing-screen.component.html  |  4 +-
 ...r-attributes-listing-screen.component.html |  4 +-
 ...er-templates-listing-screen.component.html |  6 +--
 ...sier-templates-listing-screen.component.ts | 51 ++++++++-----------
 ...e-attributes-listing-screen.component.html |  4 +-
 .../screens/trash/trash-screen.component.html |  2 +-
 .../user-listing-screen.component.html        |  4 +-
 ...t-dossier-deleted-documents.component.html |  4 +-
 .../dossier-overview-screen.component.html    | 10 ++--
 .../search-screen.component.html              |  4 +-
 .../services/dossier-templates.service.ts     |  6 ++-
 15 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
index 5a41656d3..83dacdb5f 100644
--- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
+++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html
@@ -24,8 +24,8 @@
     ></iqser-circle-button>
 </ng-template>
 
-<ng-template #tableItemTemplate let-download="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as download">
         <div class="cell">
             <div [class.no-bold]="download.lastDownload" class="table-item-title heading">
                 {{ download.filename }}
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
index 75474415d..6166ee55d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html
@@ -53,8 +53,8 @@
     </ng-container>
 </ng-template>
 
-<ng-template #tableItemTemplate let-field="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as field">
         <div class="cell">
             <iqser-editable-input
                 (save)="field.name = $event"
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
index aef887f5f..343626017 100644
--- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
@@ -97,8 +97,8 @@
     </div>
 </ng-template>
 
-<ng-template #tableItemTemplate let-log="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as log">
         <div class="cell">
             {{ log.message }}
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
index 5ede13e02..1fb70d6d1 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
@@ -25,8 +25,8 @@
     </div>
 </section>
 
-<ng-template #tableItemTemplate let-color="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as color">
         <div class="cell">
             <div [translate]="translations[color.key]" class="table-item-title heading"></div>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
index 558a8ffb3..305353c0b 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html
@@ -77,8 +77,8 @@
     </div>
 </ng-template>
 
-<ng-template #tableItemTemplate let-dict="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as dict">
         <div class="cell">
             <div [ngStyle]="{ 'background-color': dict.hexColor }" class="color-square"></div>
             <div class="dict-name">
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 6a2c78c77..c10ed9f52 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
@@ -64,8 +64,8 @@
     </div>
 </ng-template>
 
-<ng-template #tableItemTemplate let-attribute="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as attribute">
         <div class="cell">
             {{ attribute.label }}
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html
index e77956dfd..6dd34eda0 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html
@@ -38,7 +38,7 @@
 
 <ng-template #actionsTemplate let-dossierTemplate="entity">
     <redaction-dossier-template-actions
-        (loadDossierTemplatesData)="loadDossierTemplatesData()"
+        (loadDossierTemplatesData)="loadDossierTemplateStats()"
         [dossierTemplateId]="dossierTemplate.dossierTemplateId"
         class="actions-container"
     ></redaction-dossier-template-actions>
@@ -61,8 +61,8 @@
     </div>
 </ng-template>
 
-<ng-template #tableItemTemplate let-dossierTemplate="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as dossierTemplate">
         <div class="cell">
             <div class="table-item-title heading">
                 {{ dossierTemplate.name }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
index 90609213e..8172592dd 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
@@ -13,7 +13,6 @@ import {
     TableColumnConfig,
     Toaster,
 } from '@iqser/common-ui';
-import { DossierTemplateControllerService } from '@redaction/red-ui-http';
 import { UserService } from '@services/user.service';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { RouterHistoryService } from '@services/router-history.service';
@@ -42,22 +41,21 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
     ];
 
     constructor(
-        protected readonly _injector: Injector,
         private readonly _toaster: Toaster,
+        protected readonly _injector: Injector,
         private readonly _userService: UserService,
         private readonly _loadingService: LoadingService,
         private readonly _appStateService: AppStateService,
-        private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dialogService: AdminDialogService,
         readonly routerHistoryService: RouterHistoryService,
         readonly userPreferenceService: UserPreferenceService,
-        private readonly _dossierTemplateControllerService: DossierTemplateControllerService,
+        private readonly _dossierTemplatesService: DossierTemplatesService,
     ) {
         super(_injector);
     }
 
     ngOnInit(): void {
-        this.loadDossierTemplatesData();
+        this.loadDossierTemplateStats();
     }
 
     openBulkDeleteTemplatesDialog($event?: MouseEvent) {
@@ -66,35 +64,13 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
         });
     }
 
-    loadDossierTemplatesData() {
-        this._appStateService.reset();
-        this._loadDossierTemplateStats();
-    }
-
     openAddDossierTemplateDialog() {
         this._dialogService.openDialog('addEditDossierTemplate', null, null, () => {
-            this.loadDossierTemplatesData();
+            this.loadDossierTemplateStats();
         });
     }
 
-    private async _deleteTemplates(templateIds = this.listingService.selected.map(d => d.dossierTemplateId)) {
-        await this._dossierTemplateControllerService
-            .deleteDossierTemplates(templateIds)
-            .toPromise()
-            .catch(error => {
-                if (error.status === 409) {
-                    this._toaster.error(_('dossier-templates-listing.error.conflict'));
-                } else {
-                    this._toaster.error(_('dossier-templates-listing.error.generic'));
-                }
-            });
-        this.listingService.setSelected([]);
-        await this._dossierTemplatesService.loadAll().toPromise();
-        await this._appStateService.loadDictionaryData();
-        this.loadDossierTemplatesData();
-    }
-
-    private _loadDossierTemplateStats() {
+    loadDossierTemplateStats() {
         this.entitiesService.all.forEach(rs => {
             const dictionaries = this._appStateService.dictionaryData[rs.dossierTemplateId];
             if (dictionaries) {
@@ -107,4 +83,21 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
             }
         });
     }
+
+    private async _deleteTemplates(templateIds = this.listingService.selected.map(d => d.dossierTemplateId)) {
+        await this._dossierTemplatesService
+            .delete(templateIds)
+            .toPromise()
+            .catch(error => {
+                if (error.status === 409) {
+                    this._toaster.error(_('dossier-templates-listing.error.conflict'));
+                } else {
+                    this._toaster.error(_('dossier-templates-listing.error.generic'));
+                }
+            });
+        this.listingService.setSelected([]);
+        await this._dossierTemplatesService.loadAll().toPromise();
+        await this._appStateService.loadDictionaryData();
+        this.loadDossierTemplateStats();
+    }
 }
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 b8e64640f..3d61c2211 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
@@ -74,8 +74,8 @@
     </div>
 </ng-template>
 
-<ng-template #tableItemTemplate let-attribute="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as attribute">
         <div class="label cell">
             <span>{{ attribute.label }}</span>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
index 2b2573d95..06bc796ac 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html
@@ -41,7 +41,7 @@
 </ng-template>
 
 <ng-template #tableItemTemplate let-entity="entity">
-    <div>
+    <div *ngIf="cast(entity) as entity">
         <div class="cell filename">
             <div [matTooltip]="entity.dossierName" class="table-item-title heading" matTooltipPosition="above">
                 {{ entity.dossierName }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
index 6a76d1768..f78e18ef5 100644
--- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html
@@ -65,8 +65,8 @@
     ></iqser-circle-button>
 </ng-template>
 
-<ng-template #tableItemTemplate let-user="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as user">
         <div class="cell">
             <redaction-initials-avatar [showYou]="true" [user]="user" [withName]="true"></redaction-initials-avatar>
         </div>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
index af2998b79..08ab20e7f 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
@@ -34,8 +34,8 @@
     ></iqser-circle-button>
 </ng-template>
 
-<ng-template #tableItemTemplate let-file="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as file">
         <div class="cell filename">
             <span>{{ file.filename }}</span>
         </div>
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 69bf6ca42..32bc35237 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
@@ -121,8 +121,8 @@
     ></redaction-table-item>
 </ng-template>
 
-<ng-template #workflowItemTemplate let-file="entity">
-    <div class="workflow-item">
+<ng-template #workflowItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as file" class="workflow-item">
         <div>
             <div class="details">
                 <div [matTooltip]="file.filename" class="filename" matTooltipPosition="above">
@@ -143,15 +143,15 @@
     </div>
 </ng-template>
 
-<ng-template #statsTemplate let-file="entity">
-    <div class="small-label stats-subtitle">
+<ng-template #statsTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as file" class="small-label stats-subtitle">
         <div>
             <mat-icon svgIcon="red:pages"></mat-icon>
             {{ file.numberOfPages }}
         </div>
         <div>
             <mat-icon svgIcon="red:exclude-pages"></mat-icon>
-            {{ file.excludedPagesCount }}
+            {{ file.excludedPages.length }}
         </div>
         <div *ngIf="file.lastOCRTime" [matTooltipPosition]="'above'" [matTooltip]="'dossier-overview.ocr-performed' | translate">
             <mat-icon svgIcon="red:ocr"></mat-icon>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
index 65076d3c2..e261dcdbb 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/search-screen/search-screen.component.html
@@ -21,8 +21,8 @@
     </div>
 </section>
 
-<ng-template #tableItemTemplate let-item="entity">
-    <div>
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as item">
         <div class="cell filename">
             <div [matTooltip]="item.filename" class="table-item-title heading" matTooltipPosition="above">
                 <span
diff --git a/apps/red-ui/src/app/modules/dossier/services/dossier-templates.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossier-templates.service.ts
index 5f07cc1e6..9b7867261 100644
--- a/apps/red-ui/src/app/modules/dossier/services/dossier-templates.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/dossier-templates.service.ts
@@ -1,4 +1,4 @@
-import { EntitiesService } from '@iqser/common-ui';
+import { EntitiesService, List } from '@iqser/common-ui';
 import { DossierTemplate } from '@models/file/dossier-template';
 import { IDossierTemplate } from '@redaction/red-ui-http';
 import { Injectable, Injector } from '@angular/core';
@@ -59,4 +59,8 @@ export class DossierTemplatesService extends EntitiesService<DossierTemplate, ID
             map(() => this.all),
         );
     }
+
+    delete(body: List): Observable<unknown> {
+        return super.delete(body, `${this._defaultModelPath}/delete`);
+    }
 }