From 7d1b0d4423638877be6ce252f8717e95e8d8283b Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 31 Jan 2022 13:34:58 +0200
Subject: [PATCH 01/33] added ids for dossier tests

---
 .../add-dossier-dialog.component.html                | 12 +++++++++---
 .../dossier-details/dossier-details.component.html   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
index 47e3f849e..f20f13d02 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
@@ -8,6 +8,7 @@
                 <input
                     [placeholder]="'add-dossier-dialog.form.name.placeholder' | translate"
                     formControlName="dossierName"
+                    id="dossierNameInput"
                     name="dossierName"
                     type="text"
                 />
@@ -16,7 +17,12 @@
             <div class="iqser-input-group required w-400">
                 <mat-form-field floatLabel="always">
                     <mat-label>{{ 'add-dossier-dialog.form.template' | translate }}</mat-label>
-                    <mat-select (valueChange)="dossierTemplateChanged($event)" formControlName="dossierTemplateId" style="width: 100%">
+                    <mat-select
+                        (valueChange)="dossierTemplateChanged($event)"
+                        formControlName="dossierTemplateId"
+                        id="dossierTemplateSelect"
+                        style="width: 100%"
+                    >
                         <mat-option
                             *ngFor="let dossierTemplate of dossierTemplates"
                             [matTooltip]="dossierTemplate.description ? dossierTemplate.description : dossierTemplate.name"
@@ -88,7 +94,7 @@
         </div>
 
         <div class="dialog-actions">
-            <button [disabled]="disabled" color="primary" mat-flat-button type="submit">
+            <button [disabled]="disabled" color="primary" id="createDossierSaveButton" mat-flat-button type="submit">
                 {{ 'add-dossier-dialog.actions.save' | translate }}
             </button>
 
@@ -102,7 +108,7 @@
         </div>
     </form>
 
-    <iqser-circle-button class="dialog-close" icon="iqser:close" (action)="close()"></iqser-circle-button>
+    <iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
 </section>
 
 <ng-template #reportTemplateOptionTemplate let-option="option">
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
index 71ffaaf40..3872efe14 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
@@ -5,7 +5,7 @@
     </div>
 
     <div class="header-wrapper mt-8">
-        <div class="heading-xl flex-1">{{ dossier.dossierName }}</div>
+        <div class="heading-xl flex-1" id="dossierDetailsDossierName">{{ dossier.dossierName }}</div>
         <ng-container
             *ngTemplateOutlet="collapsible; context: { action: 'collapse', tooltip: (collapseTooltip | translate) }"
         ></ng-container>

From fd31c038e6b54d01bf5ca0d2d059f3f7c1383c20 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 1 Feb 2022 13:07:20 +0200
Subject: [PATCH 02/33] update common

---
 libs/common-ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/common-ui b/libs/common-ui
index 31b60ff11..918326d4f 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 31b60ff117a8d8ecb9617be3b0c9e1822d437034
+Subproject commit 918326d4fef9a53a856fbfedfff66dc4218a7924

From a4c5ed739d08b17779fc065969d5b58dc013fdf6 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 1 Feb 2022 15:41:21 +0200
Subject: [PATCH 03/33] more ids for dossier tests

---
 .../components/breadcrumbs/breadcrumbs.component.html |  1 +
 .../add-dossier-dialog.component.html                 |  1 +
 .../edit-dossier-dialog.component.html                | 11 +++++++++--
 .../edit-dossier-team.component.html                  |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

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 fdf4f4b27..85326ed20 100644
--- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html
+++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html
@@ -13,6 +13,7 @@
                 [routerLink]="breadcrumb.routerLink"
                 class="breadcrumb"
                 routerLinkActive="active"
+                [id]="first ? 'navigateToActiveDossiers' : ''"
             >
                 {{ breadcrumb.name$ | async }}
             </a>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
index f20f13d02..9c062fa53 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
@@ -104,6 +104,7 @@
                 [label]="'add-dossier-dialog.actions.save-and-add-members' | translate"
                 [type]="iconButtonTypes.dark"
                 icon="red:assign"
+                id="createDossierEditTeamButton"
             ></iqser-icon-button>
         </div>
     </form>
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 ea40e9549..ad7414684 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
@@ -49,7 +49,14 @@
             </div>
 
             <div *ngIf="showActionButtons" class="dialog-actions">
-                <button (click)="save()" [disabled]="disabled || !valid || !changed" color="primary" mat-flat-button type="button">
+                <button
+                    (click)="save()"
+                    [disabled]="disabled || !valid || !changed"
+                    color="primary"
+                    mat-flat-button
+                    type="button"
+                    id="editDossierSaveButton"
+                >
                     {{ 'edit-dossier-dialog.actions.save' | translate }}
                 </button>
                 <iqser-icon-button
@@ -65,5 +72,5 @@
         </div>
     </div>
 
-    <iqser-circle-button class="dialog-close" icon="iqser:close" (action)="close()"></iqser-circle-button>
+    <iqser-circle-button class="dialog-close" icon="iqser:close" (action)="close()" id="editDossierCloseButton"></iqser-circle-button>
 </section>
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
index 5d2809aec..013b7b377 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html
@@ -2,7 +2,7 @@
     <div class="iqser-input-group w-300 required">
         <mat-form-field floatLabel="always">
             <mat-label>{{ 'assign-dossier-owner.dialog.single-user' | translate }}</mat-label>
-            <mat-select formControlName="owner">
+            <mat-select formControlName="owner" id="editDossierOwnerSelect">
                 <mat-option *ngFor="let userId of ownersSelectOptions" [value]="userId">
                     {{ userId | name }}
                 </mat-option>

From 38616a76ce8bf945706f534508f54e9d70e6f411 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Mon, 14 Feb 2022 12:58:01 +0200
Subject: [PATCH 04/33] fix RED-3395: mark page as seen when user changes

---
 .../file-workload/file-workload.component.html  |  3 ++-
 .../page-indicator/page-indicator.component.ts  | 17 +++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

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 176f71a18..f36d12806 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
@@ -92,7 +92,7 @@
                 <mat-icon svgIcon="red:nav-first"></mat-icon>
             </div>
 
-            <div class="pages" id="pages">
+            <div *ngIf="state.fileData$ | async as fileData" class="pages" id="pages">
                 <redaction-page-indicator
                     (pageSelected)="pageSelectedByClick($event)"
                     *ngFor="let pageNumber of displayedPages"
@@ -100,6 +100,7 @@
                     [active]="pageNumber === activeViewerPage"
                     [number]="pageNumber"
                     [showDottedIcon]="hasOnlyManualRedactionsAndIsExcluded(pageNumber)"
+                    [viewedPages]="fileData.viewedPages"
                 ></redaction-page-indicator>
             </div>
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
index dc226a6cc..2e06a8c49 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts
@@ -1,11 +1,9 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
 import { ConfigService } from '@services/config.service';
-import { DossiersService } from '@services/entity-services/dossiers.service';
 import { ViewedPagesService } from '@services/entity-services/viewed-pages.service';
 import { IViewedPage } from '@red/domain';
 import { AutoUnsubscribe } from '@iqser/common-ui';
-import { FilesMapService } from '@services/entity-services/files-map.service';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { firstValueFrom } from 'rxjs';
 
@@ -20,6 +18,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
     @Input() showDottedIcon = false;
     @Input() number: number;
     @Input() activeSelection = false;
+    @Input() viewedPages: IViewedPage[] = [];
 
     @Output() readonly pageSelected = new EventEmitter<number>();
 
@@ -28,8 +27,6 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
 
     constructor(
         private readonly _viewedPagesService: ViewedPagesService,
-        private readonly _filesMapService: FilesMapService,
-        private readonly _dossiersService: DossiersService,
         private readonly _configService: ConfigService,
         private readonly _changeDetectorRef: ChangeDetectorRef,
         private readonly _permissionService: PermissionsService,
@@ -39,7 +36,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
     }
 
     get activePage() {
-        return this._viewedPages.find(p => p.page === this.number);
+        return this.viewedPages.find(p => p.page === this.number);
     }
 
     get dossierId() {
@@ -50,10 +47,6 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
         return this._stateService.fileId;
     }
 
-    private get _viewedPages(): IViewedPage[] {
-        return this._stateService.fileData?.viewedPages || [];
-    }
-
     ngOnChanges() {
         this._setReadState();
         return this.handlePageRead();
@@ -104,7 +97,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
         if (this.activePage) {
             this.activePage.showAsUnseen = false;
         } else {
-            this._viewedPages.push({ page: this.number, fileId: this.fileId });
+            this.viewedPages.push({ page: this.number, fileId: this.fileId });
         }
         this._setReadState();
     }
@@ -113,8 +106,8 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy
         const removePage$ = this._viewedPagesService.removePage(this.dossierId, this.fileId, this.number);
         await firstValueFrom(removePage$);
 
-        this._viewedPages.splice(
-            this._viewedPages.findIndex(p => p.page === this.number),
+        this.viewedPages.splice(
+            this.viewedPages.findIndex(p => p.page === this.number),
             1,
         );
         this._setReadState();

From 8d1a88711fe537b74d810cc68b5c1dfa59402d9f Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Mon, 14 Feb 2022 12:02:25 +0100
Subject: [PATCH 05/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3214 -> 3213 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7ecfcc778..2ee2fb9c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.229.0",
+  "version": "3.230.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index bce044f60b9f490928f216651201322298cf2d52..2e5786990a095a3ce01506304f507f0006e2d694 100644
GIT binary patch
delta 3030
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
Y+qs?Fxt-g&{bJky0Vw1kF#u2i0KR<eUjP6A

delta 3031
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
Zc5df(Zs&Gx=k|+j{|CQwet-Z_0020o==uNv


From 9e94ecb3b62debe4af9632455239c224467bc479 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 1 Feb 2022 16:30:25 +0200
Subject: [PATCH 06/33] added dossier status model and service

---
 .../entity-services/dossier-status.service.ts | 12 ++++++++++
 libs/common-ui                                |  2 +-
 .../dossier-status/dossier-status.model.ts    | 24 +++++++++++++++++++
 .../src/lib/dossier-status/dossier-status.ts  |  6 +++++
 .../src/lib/dossier-status/index.ts           |  2 ++
 5 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
 create mode 100644 libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
 create mode 100644 libs/red-domain/src/lib/dossier-status/dossier-status.ts
 create mode 100644 libs/red-domain/src/lib/dossier-status/index.ts

diff --git a/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
new file mode 100644
index 000000000..7a97df2f7
--- /dev/null
+++ b/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
@@ -0,0 +1,12 @@
+import { Injectable, Injector } from '@angular/core';
+import { EntitiesService } from '../../../../../../libs/common-ui/src';
+import { DossierStatus, IDossierStatus } from '../../../../../../libs/red-domain/src/lib/dossier-status';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class DossierStatusService extends EntitiesService<DossierStatus, IDossierStatus> {
+    constructor(protected readonly _injector: Injector) {
+        super(_injector, DossierStatus, 'dossier-status');
+    }
+}
diff --git a/libs/common-ui b/libs/common-ui
index 77e227582..5a0e5accb 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 77e22758239cf564965e82579e662416a6349010
+Subproject commit 5a0e5accb76b8e4d2d2f5de64822a716c6572f37
diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts b/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
new file mode 100644
index 000000000..1a5ed6609
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
@@ -0,0 +1,24 @@
+import { IDossierStatus } from './dossier-status';
+import { IListable } from '@iqser/common-ui';
+
+export class DossierStatus implements IDossierStatus, IListable {
+    readonly description: string;
+    readonly dossierStatusId: string;
+    readonly dossierTemplateId: string;
+    readonly name: string;
+
+    constructor(dossierStatus: IDossierStatus) {
+        this.description = dossierStatus.description;
+        this.dossierStatusId = dossierStatus.dossierStatusId;
+        this.dossierTemplateId = dossierStatus.dossierTemplateId;
+        this.name = dossierStatus.name;
+    }
+
+    get id(): string {
+        return this.dossierStatusId;
+    }
+
+    get searchKey(): string {
+        return this.name;
+    }
+}
diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.ts b/libs/red-domain/src/lib/dossier-status/dossier-status.ts
new file mode 100644
index 000000000..ed8338a6a
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-status/dossier-status.ts
@@ -0,0 +1,6 @@
+export interface IDossierStatus {
+    description: string;
+    dossierStatusId: string;
+    dossierTemplateId: string;
+    name: string;
+}
diff --git a/libs/red-domain/src/lib/dossier-status/index.ts b/libs/red-domain/src/lib/dossier-status/index.ts
new file mode 100644
index 000000000..1ec59b1ae
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-status/index.ts
@@ -0,0 +1,2 @@
+export * from './dossier-status';
+export * from './dossier-status.model';

From 4c67355bb4e9061eaa101a75cdf6eae8cf351ad3 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Wed, 2 Feb 2022 14:13:27 +0200
Subject: [PATCH 07/33] wip states screen

---
 .../app/modules/admin/admin-routing.module.ts |  9 ++
 .../admin-side-nav.component.ts               |  1 +
 .../src/app/modules/admin/admin.module.ts     | 16 +++-
 ...d-edit-dossier-state-dialog.component.html | 55 ++++++++++++
 ...d-edit-dossier-state-dialog.component.scss |  5 ++
 ...add-edit-dossier-state-dialog.component.ts | 45 ++++++++++
 ...ssier-states-listing-screen.component.html | 78 +++++++++++++++++
 ...ssier-states-listing-screen.component.scss | 14 ++++
 ...dossier-states-listing-screen.component.ts | 84 +++++++++++++++++++
 .../admin/services/admin-dialog.service.ts    |  8 +-
 .../entity-services/dossier-state.service.ts  | 17 ++++
 .../entity-services/dossier-status.service.ts | 12 ---
 apps/red-ui/src/assets/i18n/de.json           |  1 +
 apps/red-ui/src/assets/i18n/en.json           | 33 ++++++++
 .../lib/dossier-state/dossier-state.model.ts  | 26 ++++++
 .../dossier-state.ts}                         |  3 +-
 .../red-domain/src/lib/dossier-state/index.ts |  2 +
 .../dossier-status/dossier-status.model.ts    | 24 ------
 .../src/lib/dossier-status/index.ts           |  2 -
 .../src/lib/dossiers/dossier.model.ts         |  2 +
 libs/red-domain/src/lib/dossiers/dossier.ts   |  1 +
 21 files changed, 396 insertions(+), 42 deletions(-)
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
 create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
 create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
 create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts
 create mode 100644 apps/red-ui/src/app/services/entity-services/dossier-state.service.ts
 delete mode 100644 apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
 create mode 100644 libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
 rename libs/red-domain/src/lib/{dossier-status/dossier-status.ts => dossier-state/dossier-state.ts} (63%)
 create mode 100644 libs/red-domain/src/lib/dossier-state/index.ts
 delete mode 100644 libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
 delete mode 100644 libs/red-domain/src/lib/dossier-status/index.ts

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 f4351eaed..6ce27d21f 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
@@ -21,6 +21,7 @@ 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 { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
 
 const routes: Routes = [
     { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' },
@@ -114,6 +115,14 @@ const routes: Routes = [
                             routeGuards: [AuthGuard, RedRoleGuard],
                         },
                     },
+                    {
+                        path: 'dossier-states',
+                        component: DossierStatesListingScreenComponent,
+                        canActivate: [CompositeRouteGuard],
+                        data: {
+                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
+                        },
+                    },
                     {
                         path: 'default-colors',
                         component: DefaultColorsScreenComponent,
diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
index 7578ddd03..0be9e0c68 100644
--- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts
@@ -62,6 +62,7 @@ export class AdminSideNavComponent implements OnInit {
             { screen: 'watermark', label: _('watermark') },
             { screen: 'file-attributes', label: _('file-attributes') },
             { screen: 'dossier-attributes', label: _('dossier-attributes') },
+            { screen: 'dossier-states', label: _('dossier-states') },
             { screen: 'reports', label: _('reports') },
             { screen: 'justifications', label: _('justifications') },
         ],
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 c36811d81..10c37878c 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -46,6 +46,9 @@ import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form.
 import { FileAttributesConfigurationsDialogComponent } from './dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component';
 import { SharedAdminModule } from './shared/shared-admin.module';
 import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component';
+import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
+import { AddEditDossierStateDialogComponent } from './dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component';
+import { A11yModule } from '@angular/cdk/a11y';
 
 const dialogs = [
     AddEditDossierTemplateDialogComponent,
@@ -95,8 +98,17 @@ const components = [
 ];
 
 @NgModule({
-    declarations: [...components],
+    declarations: [...components, DossierStatesListingScreenComponent, AddEditDossierStateDialogComponent],
     providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService],
-    imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule],
+    imports: [
+        CommonModule,
+        SharedModule,
+        AdminRoutingModule,
+        SharedAdminModule,
+        NgxChartsModule,
+        ColorPickerModule,
+        MonacoEditorModule,
+        A11yModule,
+    ],
 })
 export class AdminModule {}
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
new file mode 100644
index 000000000..7c0c7d695
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -0,0 +1,55 @@
+<section class="dialog">
+    <div
+        [translateParams]="{
+            type: data.dossierState ? 'edit' : 'create',
+            name: data.dossierState?.name
+        }"
+        [translate]="'add-edit-dossier-state.title'"
+        class="dialog-header heading-l"
+    ></div>
+
+    <form [formGroup]="form">
+        <div class="dialog-content flex">
+            <div class="iqser-input-group required w-300">
+                <label translate="add-edit-dossier-state.form.name"></label>
+                <input
+                    [placeholder]="'add-edit-dossier-state.form.name-placeholder' | translate"
+                    formControlName="name"
+                    name="name"
+                    type="text"
+                />
+            </div>
+
+            <div class="iqser-input-group required">
+                <label translate="add-edit-dossier-state.form.description"></label>
+                <input
+                    [placeholder]="'add-edit-dossier-state.form.description-placeholder' | translate"
+                    class="hex-color-input"
+                    formControlName="description"
+                    name="description"
+                    type="text"
+                />
+                <div
+                    (colorPickerChange)="form.get('description').setValue($event)"
+                    [colorPicker]="form.get('description').value"
+                    [cpOutputFormat]="'hex'"
+                    [style.background]="form.get('description').value"
+                    class="input-icon"
+                >
+                    <mat-icon
+                        *ngIf="!form.get('description').value || form.get('description').value?.length === 0"
+                        svgIcon="red:color-picker"
+                    ></mat-icon>
+                </div>
+            </div>
+        </div>
+
+        <div class="dialog-actions">
+            <button (click)="save()" [disabled]="disabled" color="primary" mat-flat-button type="button">
+                {{ 'add-edit-dossier-state.save' | translate }}
+            </button>
+        </div>
+    </form>
+
+    <iqser-circle-button (action)="close()" class="dialog-close" icon="iqser:close"></iqser-circle-button>
+</section>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss
new file mode 100644
index 000000000..8bd9b16aa
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss
@@ -0,0 +1,5 @@
+.iqser-input-group:nth-child(2) {
+    width: fit-content;
+    margin-top: 0;
+    margin-left: 16px;
+}
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
new file mode 100644
index 000000000..6e3193355
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts
@@ -0,0 +1,45 @@
+import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core';
+import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+
+interface DialogData {
+    dossierState: IDossierState;
+    dossierTemplateId: string;
+}
+
+@Component({
+    selector: 'redaction-add-edit-dossier-state-dialog',
+    templateUrl: './add-edit-dossier-state-dialog.component.html',
+    styleUrls: ['./add-edit-dossier-state-dialog.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
+    constructor(
+        private readonly _formBuilder: FormBuilder,
+        protected readonly _injector: Injector,
+        protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public data: DialogData,
+    ) {
+        super(_injector, _dialogRef);
+        this.form = this._getForm(data.dossierState);
+        this.initialFormValue = this.form.getRawValue();
+    }
+
+    save(): void {
+        const dossierState: IDossierState = {
+            dossierStatusId: this.data.dossierState?.dossierStatusId,
+            dossierTemplateId: this.data.dossierTemplateId,
+            ...this.form.getRawValue(),
+        };
+        this._dialogRef.close(dossierState);
+    }
+
+    private _getForm(dossierState: IDossierState): FormGroup {
+        return this._formBuilder.group({
+            name: [dossierState?.name, Validators.required],
+            description: [dossierState?.description, Validators.required],
+        });
+    }
+}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
new file mode 100644
index 000000000..74fd22735
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -0,0 +1,78 @@
+<section>
+    <div class="page-header">
+        <redaction-dossier-template-breadcrumbs class="flex-1"></redaction-dossier-template-breadcrumbs>
+
+        <div class="actions flex-1">
+            <redaction-dossier-template-actions></redaction-dossier-template-actions>
+
+            <iqser-circle-button
+                [routerLink]="['../..']"
+                [tooltip]="'common.close' | translate"
+                icon="iqser:close"
+                tooltipPosition="below"
+            ></iqser-circle-button>
+        </div>
+    </div>
+
+    <div class="content-inner">
+        <div class="overlay-shadow"></div>
+
+        <redaction-admin-side-nav type="dossierTemplates"></redaction-admin-side-nav>
+
+        <div class="content-container">
+            <iqser-table
+                [headerTemplate]="headerTemplate"
+                [itemSize]="80"
+                [noDataText]="'dossier-states-listing.no-data.title' | translate"
+                [noMatchText]="'dossier-states-listing.no-match.title' | translate"
+                [selectionEnabled]="true"
+                [tableColumnConfigs]="tableColumnConfigs"
+                emptyColumnWidth="1fr"
+                noDataIcon="red:attribute"
+            ></iqser-table>
+        </div>
+    </div>
+</section>
+
+<ng-template #headerTemplate>
+    <div class="table-header-actions">
+        <iqser-input-with-action
+            [(value)]="searchService.searchValue"
+            [placeholder]="'dossier-states-listing.search' | translate"
+        ></iqser-input-with-action>
+
+        <iqser-icon-button
+            (action)="openAddEditStateDialog($event)"
+            *ngIf="currentUser.isAdmin"
+            [label]="'dossier-states-listing.add-new' | translate"
+            [type]="iconButtonTypes.primary"
+            icon="iqser:plus"
+        ></iqser-icon-button>
+    </div>
+</ng-template>
+
+<ng-template #tableItemTemplate let-entity="entity">
+    <div *ngIf="cast(entity) as state">
+        <div class="cell">
+            <div class="flex-align-items-center">
+                <div class="dossier-state-square" [style.background-color]="state.description"></div>
+                <div class="state-name">{{ state.name }}</div>
+            </div>
+        </div>
+
+        <div class="cell small-label">
+            <span>{{ state.dossierCount }}</span>
+        </div>
+
+        <div class="cell">
+            <div *ngIf="currentUser.isAdmin" class="action-buttons">
+                <iqser-circle-button
+                    (action)="openAddEditStateDialog($event, state)"
+                    [tooltip]="'dossier-states-listing.action.edit' | translate"
+                    [type]="circleButtonTypes.dark"
+                    icon="iqser:edit"
+                ></iqser-circle-button>
+            </div>
+        </div>
+    </div>
+</ng-template>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
new file mode 100644
index 000000000..1df526cd4
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
@@ -0,0 +1,14 @@
+@use 'variables';
+
+.dossier-state-square {
+    height: 16px;
+    width: 16px;
+    margin-right: 16px;
+}
+
+.state-name {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 20px;
+    color: variables.$grey-1;
+}
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
new file mode 100644
index 000000000..6aaa067f9
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts
@@ -0,0 +1,84 @@
+import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/core';
+import {
+    CircleButtonTypes,
+    DefaultListingServices,
+    IconButtonTypes,
+    ListingComponent,
+    LoadingService,
+    TableColumnConfig,
+} from '../../../../../../../../libs/common-ui/src';
+import { DossierState, IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+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 { firstValueFrom } from 'rxjs';
+import { DossierTemplatesService } from '../../../../services/entity-services/dossier-templates.service';
+import { AdminDialogService } from '../../services/admin-dialog.service';
+import { UserService } from '../../../../services/user.service';
+import { AppStateService } from '../../../../state/app-state.service';
+
+@Component({
+    templateUrl: './dossier-states-listing-screen.component.html',
+    styleUrls: ['./dossier-states-listing-screen.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    providers: [
+        ...DefaultListingServices,
+        { provide: ListingComponent, useExisting: forwardRef(() => DossierStatesListingScreenComponent) },
+    ],
+})
+export class DossierStatesListingScreenComponent extends ListingComponent<DossierState> implements OnInit, OnDestroy {
+    readonly iconButtonTypes = IconButtonTypes;
+    readonly circleButtonTypes = CircleButtonTypes;
+    readonly currentUser = this._userService.currentUser;
+    readonly tableHeaderLabel = _('dossier-states-listing.table-header.title');
+    readonly tableColumnConfigs: TableColumnConfig<DossierState>[] = [
+        { label: _('dossier-states-listing.table-col-names.name'), sortByKey: 'searchKey' },
+        { label: _('dossier-states-listing.table-col-names.dossiers-count'), sortByKey: 'dossierCount' },
+    ];
+
+    constructor(
+        protected readonly _injector: Injector,
+        private readonly _loadingService: LoadingService,
+        private readonly _dossiersService: DossiersService,
+        private readonly _dossierStateService: DossierStateService,
+        private readonly _dossierTemplatesService: DossierTemplatesService,
+        private readonly _dialogService: AdminDialogService,
+        private readonly _userService: UserService,
+        private readonly _appStateService: AppStateService,
+    ) {
+        super(_injector);
+    }
+
+    async ngOnInit(): Promise<void> {
+        await this._loadData();
+    }
+
+    openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) {
+        const data = {
+            dossierState,
+            dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId,
+        };
+        this._dialogService.openDialog('addEditDossierState', $event, data, async (newValue: IDossierState) => {
+            await firstValueFrom(this._dossierStateService.setDossierState(newValue));
+            await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
+            await this._loadData();
+        });
+    }
+
+    private async _loadData() {
+        this._loadingService.start();
+
+        try {
+            const templateId = this._dossierTemplatesService.activeDossierTemplateId;
+            const dossierStates = await firstValueFrom(this._dossierStateService.loadAll(`dossier-status/dossier-template/${templateId}`));
+            const dossiers = this._dossiersService.all;
+            dossierStates.forEach(state => {
+                state.dossierCount = dossiers.filter(
+                    dossier => dossier.dossierStatusId === state.dossierStatusId && dossier.dossierTemplateId === templateId,
+                ).length;
+            });
+            this.entitiesService.setEntities(dossierStates || []);
+        } catch (e) {}
+        this._loadingService.stop();
+    }
+}
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 1ee12ff67..ff3c3fb67 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
@@ -13,6 +13,7 @@ import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-doss
 import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } 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';
 
 type DialogType =
     | 'confirm'
@@ -27,7 +28,9 @@ type DialogType =
     | 'smtpAuthConfig'
     | 'addEditDossierTemplate'
     | 'addEditDossierAttribute'
-    | 'uploadDictionary';
+    | 'addEditJustification'
+    | 'uploadDictionary'
+    | 'addEditDossierState';
 
 @Injectable()
 export class AdminDialogService extends DialogService<DialogType> {
@@ -82,6 +85,9 @@ export class AdminDialogService extends DialogService<DialogType> {
         uploadDictionary: {
             component: UploadDictionaryDialogComponent,
         },
+        addEditDossierState: {
+            component: AddEditDossierStateDialogComponent,
+        },
     };
 
     constructor(protected readonly _dialog: MatDialog) {
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
new file mode 100644
index 000000000..d3be59e74
--- /dev/null
+++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts
@@ -0,0 +1,17 @@
+import { Injectable, Injector } from '@angular/core';
+import { EntitiesService, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
+import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
+
+@Injectable({
+    providedIn: 'root',
+})
+export class DossierStateService extends EntitiesService<DossierState, IDossierState> {
+    constructor(protected readonly _injector: Injector) {
+        super(_injector, DossierState, 'dossier-status');
+    }
+
+    @Validate()
+    setDossierState(@RequiredParam() body: IDossierState) {
+        return this._post<unknown>(body, this._defaultModelPath);
+    }
+}
diff --git a/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
deleted file mode 100644
index 7a97df2f7..000000000
--- a/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Injectable, Injector } from '@angular/core';
-import { EntitiesService } from '../../../../../../libs/common-ui/src';
-import { DossierStatus, IDossierStatus } from '../../../../../../libs/red-domain/src/lib/dossier-status';
-
-@Injectable({
-    providedIn: 'root',
-})
-export class DossierStatusService extends EntitiesService<DossierStatus, IDossierStatus> {
-    constructor(protected readonly _injector: Injector) {
-        super(_injector, DossierStatus, 'dossier-status');
-    }
-}
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index 21819e941..b228549e1 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -605,6 +605,7 @@
     "title": "Datei-Attribute anlegen"
   },
   "dossier": "Dossier",
+  "dossier-states": "",
   "dossier-attribute-types": {
     "date": "Datum",
     "image": "Bild",
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 9a64201c7..993a08598 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -88,6 +88,16 @@
     "save": "Save Dossier Template",
     "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Template"
   },
+  "add-edit-dossier-state": {
+    "form": {
+      "name": "Status Name",
+      "name-placeholder": "Enter Name",
+      "description": "Hex Color",
+      "description-placeholder": "#"
+    },
+    "save": "Save Status",
+    "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Status"
+  },
   "add-edit-file-attribute": {
     "form": {
       "column-header": "CSV Column Header",
@@ -612,6 +622,29 @@
     "title": "Introduce File Attributes"
   },
   "dossier": "Dossier",
+  "dossier-states": "Dossier States",
+  "dossier-states-listing": {
+    "action": {
+      "delete": "Delete Status",
+      "edit": "Edit Status"
+    },
+    "search": "Search...",
+    "table-col-names": {
+      "name": "Name",
+      "dossiers-count": "Dossiers Count"
+    },
+    "add-new": "New Status",
+    "table-header": {
+      "title": "{length} dossier {length, plural, one{state} other{states}}"
+    },
+    "no-data": {
+      "action": "New State",
+      "title": "There are no dossier states."
+    },
+    "no-match": {
+      "title": "No dossier states match your current filters."
+    }
+  },
   "dossier-attribute-types": {
     "date": "Date",
     "image": "Image",
diff --git a/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
new file mode 100644
index 000000000..070171643
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
@@ -0,0 +1,26 @@
+import { IListable } from '@iqser/common-ui';
+import { IDossierState } from './dossier-state';
+
+export class DossierState implements IDossierState, IListable {
+    readonly description: string;
+    readonly dossierStatusId: string;
+    readonly dossierTemplateId: string;
+    readonly name: string;
+    dossierCount?: number;
+
+    constructor(dossierState: IDossierState) {
+        this.description = dossierState.description;
+        this.dossierStatusId = dossierState.dossierStatusId;
+        this.dossierTemplateId = dossierState.dossierTemplateId;
+        this.name = dossierState.name;
+        this.dossierCount = dossierState.dossierCount;
+    }
+
+    get id(): string {
+        return this.dossierStatusId;
+    }
+
+    get searchKey(): string {
+        return this.name;
+    }
+}
diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
similarity index 63%
rename from libs/red-domain/src/lib/dossier-status/dossier-status.ts
rename to libs/red-domain/src/lib/dossier-state/dossier-state.ts
index ed8338a6a..7ebd532e8 100644
--- a/libs/red-domain/src/lib/dossier-status/dossier-status.ts
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
@@ -1,6 +1,7 @@
-export interface IDossierStatus {
+export interface IDossierState {
     description: string;
     dossierStatusId: string;
     dossierTemplateId: string;
     name: string;
+    dossierCount?: number;
 }
diff --git a/libs/red-domain/src/lib/dossier-state/index.ts b/libs/red-domain/src/lib/dossier-state/index.ts
new file mode 100644
index 000000000..166b90570
--- /dev/null
+++ b/libs/red-domain/src/lib/dossier-state/index.ts
@@ -0,0 +1,2 @@
+export * from './dossier-state';
+export * from './dossier-state.model';
diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts b/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
deleted file mode 100644
index 1a5ed6609..000000000
--- a/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { IDossierStatus } from './dossier-status';
-import { IListable } from '@iqser/common-ui';
-
-export class DossierStatus implements IDossierStatus, IListable {
-    readonly description: string;
-    readonly dossierStatusId: string;
-    readonly dossierTemplateId: string;
-    readonly name: string;
-
-    constructor(dossierStatus: IDossierStatus) {
-        this.description = dossierStatus.description;
-        this.dossierStatusId = dossierStatus.dossierStatusId;
-        this.dossierTemplateId = dossierStatus.dossierTemplateId;
-        this.name = dossierStatus.name;
-    }
-
-    get id(): string {
-        return this.dossierStatusId;
-    }
-
-    get searchKey(): string {
-        return this.name;
-    }
-}
diff --git a/libs/red-domain/src/lib/dossier-status/index.ts b/libs/red-domain/src/lib/dossier-status/index.ts
deleted file mode 100644
index 1ec59b1ae..000000000
--- a/libs/red-domain/src/lib/dossier-status/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './dossier-status';
-export * from './dossier-status.model';
diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts
index 8c8ab6e5b..e2a79d550 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.model.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts
@@ -11,6 +11,7 @@ export class Dossier implements IDossier, IListable {
     readonly approverIds: List;
     readonly reportTemplateIds: List;
     readonly dossierName: string;
+    readonly dossierStatusId: string;
     readonly date: string;
     readonly dueDate?: string;
     readonly description?: string;
@@ -29,6 +30,7 @@ export class Dossier implements IDossier, IListable {
         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;
diff --git a/libs/red-domain/src/lib/dossiers/dossier.ts b/libs/red-domain/src/lib/dossiers/dossier.ts
index 9b4883801..1ff219033 100644
--- a/libs/red-domain/src/lib/dossiers/dossier.ts
+++ b/libs/red-domain/src/lib/dossiers/dossier.ts
@@ -7,6 +7,7 @@ export interface IDossier {
     readonly date: string;
     readonly description?: string;
     readonly dossierId: string;
+    readonly dossierStatusId: string;
     readonly dossierName: string;
     readonly dossierTemplateId: string;
     readonly downloadFileTypes?: List<DownloadFileType>;

From 30883a5349ce2e6c0fefd347c4cf7d22c4162fe7 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Thu, 3 Feb 2022 21:02:11 +0200
Subject: [PATCH 08/33] finished states screen, update dossier table

---
 .../src/app/modules/admin/admin.module.ts     |  8 ++-
 ...delete-dossier-state-dialog.component.html | 39 +++++++++++++++
 ...delete-dossier-state-dialog.component.scss | 16 ++++++
 ...m-delete-dossier-state-dialog.component.ts | 46 +++++++++++++++++
 ...ssier-states-listing-screen.component.html |  6 +++
 ...dossier-states-listing-screen.component.ts | 50 ++++++++++++++++---
 .../admin/services/admin-dialog.service.ts    |  7 ++-
 .../dossiers-listing-status.component.html    |  4 ++
 .../dossiers-listing-status.component.scss    | 19 +++++++
 .../dossiers-listing-status.component.ts      | 12 +++++
 .../table-item/table-item.component.html      |  4 ++
 .../table-item/table-item.component.ts        | 16 ++++--
 .../dossiers-listing/config.service.ts        |  3 +-
 .../dossiers-listing.module.ts                |  2 +
 .../entity-services/dossier-state.service.ts  | 17 +++++++
 apps/red-ui/src/assets/i18n/en.json           | 19 ++++++-
 16 files changed, 253 insertions(+), 15 deletions(-)
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
 create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
 create 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts

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 10c37878c..f4087d8b1 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -49,6 +49,7 @@ import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-scr
 import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
 import { AddEditDossierStateDialogComponent } from './dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component';
 import { A11yModule } from '@angular/cdk/a11y';
+import { ConfirmDeleteDossierStateDialogComponent } from './dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component';
 
 const dialogs = [
     AddEditDossierTemplateDialogComponent,
@@ -98,7 +99,12 @@ const components = [
 ];
 
 @NgModule({
-    declarations: [...components, DossierStatesListingScreenComponent, AddEditDossierStateDialogComponent],
+    declarations: [
+        ...components,
+        DossierStatesListingScreenComponent,
+        AddEditDossierStateDialogComponent,
+        ConfirmDeleteDossierStateDialogComponent,
+    ],
     providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService],
     imports: [
         CommonModule,
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
new file mode 100644
index 000000000..ff36577ae
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -0,0 +1,39 @@
+<section class="dialog">
+    <div class="dialog-header heading-l">
+        {{ 'confirm-delete-dossier-state.title' | translate }}
+    </div>
+
+    <div class="dialog-content">
+        <div class="heading">{{ 'confirm-delete-dossier-state.warning' | translate: translateArgs }}</div>
+
+        <div class="replacement-suggestion">{{ 'confirm-delete-dossier-state.suggestion' | translate }}</div>
+
+        <form [formGroup]="form">
+            <div class="flex">
+                <div class="iqser-input-group required w-300">
+                    <label translate="confirm-delete-dossier-state.form.status"></label>
+                    <mat-select
+                        formControlName="replaceDossierStatusId"
+                        [placeholder]="'confirm-delete-dossier-state.form.status-placeholder' | translate"
+                    >
+                        <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
+                            {{ state.name }}
+                        </mat-option>
+                    </mat-select>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="dialog-actions">
+        <button (click)="dialogRef.close(true)" color="primary" mat-flat-button>
+            {{ 'confirm-delete-dossier-state.delete-only' | translate }}
+        </button>
+        <button (click)="dialogRef.close(replaceDossierStatusId)" mat-flat-button [disabled]="!replaceDossierStatusId">
+            {{ 'confirm-delete-dossier-state.delete-replace' | translate }}
+        </button>
+        <div (click)="dialogRef.close()" [translate]="'confirm-delete-dossier-state.cancel'" class="all-caps-label cancel"></div>
+    </div>
+
+    <iqser-circle-button class="dialog-close" icon="iqser:close" mat-dialog-close></iqser-circle-button>
+</section>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
new file mode 100644
index 000000000..616e7b39c
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.scss
@@ -0,0 +1,16 @@
+@use 'variables';
+
+.replacement-suggestion {
+    font-size: 13px;
+    line-height: 18px;
+    color: variables.$grey-1;
+    margin-bottom: 24px;
+}
+
+.dialog-header {
+    color: variables.$primary;
+}
+
+.heading {
+    margin-bottom: 8px;
+}
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
new file mode 100644
index 000000000..d80ece9ad
--- /dev/null
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -0,0 +1,46 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { FormBuilder, FormGroup } from '@angular/forms';
+
+interface DialogData {
+    toBeDeletedState: IDossierState;
+    otherStates: IDossierState[];
+    dossierCount: number;
+}
+
+@Component({
+    selector: 'redaction-confirm-delete-dossier-state-dialog',
+    templateUrl: './confirm-delete-dossier-state-dialog.component.html',
+    styleUrls: ['./confirm-delete-dossier-state-dialog.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ConfirmDeleteDossierStateDialogComponent {
+    readonly form: FormGroup;
+
+    constructor(
+        private readonly _formBuilder: FormBuilder,
+        readonly dialogRef: MatDialogRef<ConfirmDeleteDossierStateDialogComponent>,
+        @Inject(MAT_DIALOG_DATA) public data: DialogData,
+    ) {
+        this.form = this._getForm();
+        console.log(data);
+    }
+
+    private _getForm(): FormGroup {
+        return this._formBuilder.group({
+            replaceDossierStatusId: [null],
+        });
+    }
+
+    get translateArgs() {
+        return {
+            name: this.data.toBeDeletedState.name,
+            count: this.data.dossierCount,
+        };
+    }
+
+    get replaceDossierStatusId(): string {
+        return this.form.get('replaceDossierStatusId').value;
+    }
+}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index 74fd22735..045a9d075 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -72,6 +72,12 @@
                     [type]="circleButtonTypes.dark"
                     icon="iqser:edit"
                 ></iqser-circle-button>
+                <iqser-circle-button
+                    (action)="openConfirmDeleteStateDialog($event, state)"
+                    [tooltip]="'dossier-states-listing.action.delete' | translate"
+                    [type]="circleButtonTypes.dark"
+                    icon="iqser:trash"
+                ></iqser-circle-button>
             </div>
         </div>
     </div>
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 6aaa067f9..d3230e1e0 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
@@ -6,6 +6,7 @@ import {
     ListingComponent,
     LoadingService,
     TableColumnConfig,
+    Toaster,
 } from '../../../../../../../../libs/common-ui/src';
 import { DossierState, IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@@ -16,6 +17,7 @@ import { DossierTemplatesService } from '../../../../services/entity-services/do
 import { AdminDialogService } from '../../services/admin-dialog.service';
 import { UserService } from '../../../../services/user.service';
 import { AppStateService } from '../../../../state/app-state.service';
+import { HttpStatusCode } from '@angular/common/http';
 
 @Component({
     templateUrl: './dossier-states-listing-screen.component.html',
@@ -45,6 +47,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         private readonly _dialogService: AdminDialogService,
         private readonly _userService: UserService,
         private readonly _appStateService: AppStateService,
+        private readonly _toaster: Toaster,
     ) {
         super(_injector);
     }
@@ -59,26 +62,59 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId,
         };
         this._dialogService.openDialog('addEditDossierState', $event, data, async (newValue: IDossierState) => {
-            await firstValueFrom(this._dossierStateService.setDossierState(newValue));
-            await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
+            await this._createNewDossierStateAndRefreshView(newValue);
+        });
+    }
+
+    openConfirmDeleteStateDialog($event: MouseEvent, dossierState: IDossierState) {
+        const templateId = this._dossierTemplatesService.activeDossierTemplateId;
+        const data = {
+            toBeDeletedState: dossierState,
+            otherStates: this.entitiesService.all.filter(state => state.dossierStatusId !== dossierState.dossierStatusId),
+            dossierCount: this._getDossiersWithStateAndTemplateCount(dossierState.dossierStatusId, templateId),
+        };
+        this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string | true) => {
+            if (value) {
+                if (value === true) {
+                    console.log('asteptam');
+                } else {
+                    await firstValueFrom(this._dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
+                }
+            }
+
+            await this._appStateService.refreshDossierTemplate(templateId);
             await this._loadData();
         });
     }
 
+    private async _createNewDossierStateAndRefreshView(newValue: IDossierState): Promise<void> {
+        await firstValueFrom(this._dossierStateService.setDossierState(newValue)).catch(error => {
+            if (error.status === HttpStatusCode.Conflict) {
+                this._toaster.error(_('dossier-states-listing.error.conflict'));
+            } else {
+                this._toaster.error(_('dossier-states-listing.error.generic'));
+            }
+        });
+        await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
+        await this._loadData();
+    }
+
     private async _loadData() {
         this._loadingService.start();
 
         try {
             const templateId = this._dossierTemplatesService.activeDossierTemplateId;
-            const dossierStates = await firstValueFrom(this._dossierStateService.loadAll(`dossier-status/dossier-template/${templateId}`));
-            const dossiers = this._dossiersService.all;
+            const dossierStates = await firstValueFrom(this._dossierStateService.loadAllForTemplate(templateId));
             dossierStates.forEach(state => {
-                state.dossierCount = dossiers.filter(
-                    dossier => dossier.dossierStatusId === state.dossierStatusId && dossier.dossierTemplateId === templateId,
-                ).length;
+                state.dossierCount = this._getDossiersWithStateAndTemplateCount(state.dossierStatusId, templateId);
             });
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
         this._loadingService.stop();
     }
+
+    private _getDossiersWithStateAndTemplateCount(dossierStatusId: string, templateId: string) {
+        const dossiers = this._dossiersService.all;
+        return dossiers.filter(dossier => dossier.dossierStatusId === dossierStatusId && dossier.dossierTemplateId === templateId).length;
+    }
 }
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 ff3c3fb67..31d5dab3c 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
@@ -14,6 +14,7 @@ import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogCo
 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';
 
 type DialogType =
     | 'confirm'
@@ -30,7 +31,8 @@ type DialogType =
     | 'addEditDossierAttribute'
     | 'addEditJustification'
     | 'uploadDictionary'
-    | 'addEditDossierState';
+    | 'addEditDossierState'
+    | 'deleteDossierState';
 
 @Injectable()
 export class AdminDialogService extends DialogService<DialogType> {
@@ -88,6 +90,9 @@ export class AdminDialogService extends DialogService<DialogType> {
         addEditDossierState: {
             component: AddEditDossierStateDialogComponent,
         },
+        deleteDossierState: {
+            component: ConfirmDeleteDossierStateDialogComponent,
+        },
     };
 
     constructor(protected readonly _dialog: MatDialog) {
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
new file mode 100644
index 000000000..8bc358801
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html
@@ -0,0 +1,4 @@
+<div class="flex-align-items-center dossier-status-container">
+    <div class="dossier-status-text">{{ dossierState.name }}</div>
+    <div class="dossier-status-chip" [style.background-color]="dossierState.description"></div>
+</div>
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss
new file mode 100644
index 000000000..0c4471d56
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss
@@ -0,0 +1,19 @@
+@use 'variables';
+
+.dossier-status-container {
+    justify-content: flex-end;
+    width: 100%;
+}
+
+.dossier-status-chip {
+    width: 12px;
+    height: 6px;
+    border-radius: 6px;
+    margin-left: 8px;
+}
+
+.dossier-status-text {
+    font-size: 13px;
+    line-height: 16px;
+    color: variables.$grey-1;
+}
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
new file mode 100644
index 000000000..4ec6e70d2
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -0,0 +1,12 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
+
+@Component({
+    selector: 'redaction-dossiers-listing-status',
+    templateUrl: './dossiers-listing-status.component.html',
+    styleUrls: ['./dossiers-listing-status.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DossiersListingStatusComponent {
+    @Input() dossierState: DossierState;
+}
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 fcff19968..9a8bc9a43 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
@@ -14,4 +14,8 @@
     <div class="cell status-container">
         <redaction-dossiers-listing-actions [dossier]="dossier" [stats]="stats"></redaction-dossiers-listing-actions>
     </div>
+
+    <div class="cell">
+        <redaction-dossiers-listing-status [dossierState]="states[0]"></redaction-dossiers-listing-status>
+    </div>
 </ng-container>
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 d1e991d3c..b6c66da48 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,8 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@angular/core';
 import { Dossier, DossierStats } from '@red/domain';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
+import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 
 @Component({
     selector: 'redaction-table-item [dossier]',
@@ -10,13 +12,14 @@ import { switchMap } from 'rxjs/operators';
     styleUrls: ['./table-item.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class TableItemComponent implements OnChanges {
+export class TableItemComponent implements OnChanges, OnInit {
     @Input() dossier!: Dossier;
+    states: DossierState[];
 
     readonly stats$: Observable<DossierStats>;
     private readonly _ngOnChanges$ = new BehaviorSubject<string>(undefined);
 
-    constructor(readonly dossierStatsService: DossierStatsService) {
+    constructor(readonly dossierStatsService: DossierStatsService, readonly dossierStateService: DossierStateService) {
         this.stats$ = this._ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId)));
     }
 
@@ -25,4 +28,9 @@ export class TableItemComponent implements OnChanges {
             this._ngOnChanges$.next(this.dossier.dossierId);
         }
     }
+
+    async ngOnInit(): Promise<void> {
+        this.states = await firstValueFrom(this.dossierStateService.loadAllForTemplate('b3413395-8511-4a45-b0eb-b103012b4d8a'));
+        console.log(this.states);
+    }
 }
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 ce0711162..66fdedebd 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
@@ -26,7 +26,8 @@ export class ConfigService {
             { label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' },
             { label: _('dossier-listing.table-col-names.needs-work') },
             { label: _('dossier-listing.table-col-names.owner'), class: 'user-column' },
-            { label: _('dossier-listing.table-col-names.status'), class: 'flex-end', width: 'auto' },
+            { label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' },
+            { label: _('dossier-listing.table-col-names.dossier-status'), class: 'flex-end' },
         ];
     }
 
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 f04907531..01490f1bd 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
@@ -12,6 +12,7 @@ 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';
 
 const routes: Routes = [
     {
@@ -30,6 +31,7 @@ const routes: Routes = [
         DossiersListingDossierNameComponent,
         DossierWorkloadColumnComponent,
         TableItemComponent,
+        DossiersListingStatusComponent,
     ],
     providers: [ConfigService],
     imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],
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 d3be59e74..b5d3f8608 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
@@ -1,6 +1,7 @@
 import { Injectable, Injector } from '@angular/core';
 import { EntitiesService, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
 import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
+import { Observable } from 'rxjs';
 
 @Injectable({
     providedIn: 'root',
@@ -14,4 +15,20 @@ export class DossierStateService extends EntitiesService<DossierState, IDossierS
     setDossierState(@RequiredParam() body: IDossierState) {
         return this._post<unknown>(body, this._defaultModelPath);
     }
+
+    @Validate()
+    loadAllForTemplate(@RequiredParam() templateId: string) {
+        return this.loadAll(`${this._defaultModelPath}/dossier-template/${templateId}`);
+    }
+
+    @Validate()
+    deleteAndReplace(@RequiredParam() dossierStatusId: string, @RequiredParam() replaceDossierStatusId: string) {
+        const url = `${this._defaultModelPath}/${dossierStatusId}?replaceDossierStatusId=${replaceDossierStatusId}`;
+        return this.delete({}, url);
+    }
+
+    @Validate()
+    getById(@RequiredParam() id: string): Observable<DossierState> {
+        return this._getOne([id]);
+    }
 }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 993a08598..42a3ce3ff 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -421,6 +421,18 @@
     "toast-error": "Please confirm that you understand the ramifications of your action!",
     "warning": "Warning: this cannot be undone!"
   },
+  "confirm-delete-dossier-state": {
+    "title": "Delete Dossier Status",
+    "warning": "The {name} status is assigned to {count} Dossiers.",
+    "suggestion": "Would you like to replace the states of the Dossiers with another status?",
+    "form": {
+      "status": "Replace Status",
+      "status-placeholder": "Choose another status"
+    },
+    "delete-only": "Delete Only",
+    "delete-replace": "Delete and Replace",
+    "cancel": "Cancel"
+  },
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{User} other{Users}}",
     "delete": "Delete {usersCount, plural, one{User} other{Users}}",
@@ -628,6 +640,10 @@
       "delete": "Delete Status",
       "edit": "Edit Status"
     },
+    "error": {
+      "conflict": "Dossier State with this name already exists!",
+      "generic": "Failed to add Dossier State"
+    },
     "search": "Search...",
     "table-col-names": {
       "name": "Name",
@@ -732,7 +748,8 @@
       "name": "Name",
       "needs-work": "Workload",
       "owner": "Owner",
-      "status": "Status"
+      "documents-status": "Documents Status",
+      "dossier-status": "Dossier Status"
     },
     "table-header": {
       "title": "{length} active {length, plural, one{Dossier} other{Dossiers}}"

From 8dc2eae52529c82b54d12a39dbfd9f81c150288f Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 7 Feb 2022 07:02:09 +0200
Subject: [PATCH 09/33] wip edit dossier status

---
 .../edit-dossier-general-info.component.html  | 146 ++++++++++--------
 .../edit-dossier-general-info.component.scss  |   4 +
 .../edit-dossier-general-info.component.ts    |   9 +-
 .../dossier-documents-status.component.html   |   1 +
 .../dossier-documents-status.component.scss   |   0
 .../dossier-documents-status.component.ts     |  24 +++
 .../dossiers-listing-actions.component.html   |  10 +-
 .../dossiers-listing-actions.component.ts     |   9 +-
 .../dossiers-listing-status.component.html    |  17 +-
 .../dossiers-listing-status.component.ts      |  19 ++-
 .../table-item/table-item.component.html      |   4 +-
 .../table-item/table-item.component.ts        |  16 +-
 .../dossiers-listing.module.ts                |   2 +
 apps/red-ui/src/assets/i18n/en.json           |   1 +
 14 files changed, 166 insertions(+), 96 deletions(-)
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts

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 0af613641..a470c6ca0 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
@@ -1,71 +1,91 @@
 <form [formGroup]="form">
-    <div class="iqser-input-group required w-300">
-        <label translate="edit-dossier-dialog.general-info.form.name.label"></label>
-        <input
-            [placeholder]="'edit-dossier-dialog.general-info.form.name.placeholder' | translate"
-            formControlName="dossierName"
-            name="dossierName"
-            type="text"
-        />
-    </div>
+    <div class="flex">
+        <div class="flex fields-container">
+            <div class="iqser-input-group required w-300">
+                <label translate="edit-dossier-dialog.general-info.form.name.label"></label>
+                <input
+                    [placeholder]="'edit-dossier-dialog.general-info.form.name.placeholder' | translate"
+                    formControlName="dossierName"
+                    name="dossierName"
+                    type="text"
+                />
+            </div>
 
-    <div class="iqser-input-group required w-400">
-        <mat-form-field floatLabel="always">
-            <mat-label>{{ 'edit-dossier-dialog.general-info.form.template' | translate }}</mat-label>
-            <mat-select formControlName="dossierTemplateId" style="width: 100%">
-                <mat-option
-                    *ngFor="let dossierTemplate of dossierTemplates"
-                    [matTooltip]="dossierTemplate.description ? dossierTemplate.description : dossierTemplate.name"
-                    [value]="dossierTemplate.dossierTemplateId"
-                    matTooltipPosition="after"
+            <div class="iqser-input-group required w-400">
+                <mat-form-field floatLabel="always">
+                    <mat-label>{{ 'edit-dossier-dialog.general-info.form.template' | translate }}</mat-label>
+                    <mat-select formControlName="dossierTemplateId" style="width: 100%">
+                        <mat-option
+                            *ngFor="let dossierTemplate of dossierTemplates"
+                            [matTooltip]="dossierTemplate.description ? dossierTemplate.description : dossierTemplate.name"
+                            [value]="dossierTemplate.dossierTemplateId"
+                            matTooltipPosition="after"
+                        >
+                            {{ dossierTemplate.name }}
+                        </mat-option>
+                    </mat-select>
+                </mat-form-field>
+            </div>
+
+            <div class="iqser-input-group w-400">
+                <label translate="edit-dossier-dialog.general-info.form.description.label"></label>
+                <textarea
+                    [placeholder]="'edit-dossier-dialog.general-info.form.description.placeholder' | translate"
+                    formControlName="description"
+                    iqserHasScrollbar
+                    name="description"
+                    rows="5"
+                    type="text"
+                ></textarea>
+            </div>
+
+            <div>
+                <mat-checkbox class="watermark" color="primary" formControlName="watermarkEnabled">
+                    {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }}
+                </mat-checkbox>
+            </div>
+
+            <div>
+                <mat-checkbox class="watermark-preview" color="primary" formControlName="watermarkPreviewEnabled">
+                    {{ 'edit-dossier-dialog.general-info.form.watermark-preview' | translate }}
+                </mat-checkbox>
+            </div>
+        </div>
+
+        <div class="flex fields-container">
+            <div class="due-date">
+                <mat-checkbox
+                    (change)="hasDueDate = !hasDueDate"
+                    [checked]="hasDueDate"
+                    [disabled]="!permissionsService.canEditDossier()"
+                    class="filter-menu-checkbox"
+                    color="primary"
                 >
-                    {{ dossierTemplate.name }}
-                </mat-option>
-            </mat-select>
-        </mat-form-field>
-    </div>
+                    {{ 'edit-dossier-dialog.general-info.form.due-date' | translate }}
+                </mat-checkbox>
 
-    <div class="iqser-input-group w-400">
-        <label translate="edit-dossier-dialog.general-info.form.description.label"></label>
-        <textarea
-            [placeholder]="'edit-dossier-dialog.general-info.form.description.placeholder' | translate"
-            formControlName="description"
-            iqserHasScrollbar
-            name="description"
-            rows="5"
-            type="text"
-        ></textarea>
-    </div>
+                <div *ngIf="hasDueDate" class="iqser-input-group datepicker-wrapper">
+                    <input [matDatepicker]="picker" formControlName="dueDate" placeholder="dd/mm/yy" />
+                    <mat-datepicker-toggle [for]="picker" matSuffix>
+                        <mat-icon matDatepickerToggleIcon svgIcon="red:calendar"></mat-icon>
+                    </mat-datepicker-toggle>
+                    <mat-datepicker #picker></mat-datepicker>
+                </div>
+            </div>
 
-    <div>
-        <mat-checkbox class="watermark" color="primary" formControlName="watermarkEnabled">
-            {{ 'edit-dossier-dialog.general-info.form.watermark' | translate }}
-        </mat-checkbox>
-    </div>
-
-    <div>
-        <mat-checkbox class="watermark-preview" color="primary" formControlName="watermarkPreviewEnabled">
-            {{ 'edit-dossier-dialog.general-info.form.watermark-preview' | translate }}
-        </mat-checkbox>
-    </div>
-
-    <div class="due-date">
-        <mat-checkbox
-            (change)="hasDueDate = !hasDueDate"
-            [checked]="hasDueDate"
-            [disabled]="!permissionsService.canEditDossier(dossier)"
-            class="filter-menu-checkbox"
-            color="primary"
-        >
-            {{ 'edit-dossier-dialog.general-info.form.due-date' | translate }}
-        </mat-checkbox>
-
-        <div *ngIf="hasDueDate" class="iqser-input-group datepicker-wrapper">
-            <input [matDatepicker]="picker" formControlName="dueDate" placeholder="dd/mm/yy" />
-            <mat-datepicker-toggle [for]="picker" matSuffix>
-                <mat-icon matDatepickerToggleIcon svgIcon="red:calendar"></mat-icon>
-            </mat-datepicker-toggle>
-            <mat-datepicker #picker></mat-datepicker>
+            <div class="iqser-input-group required w-300">
+                <label translate="edit-dossier-dialog.general-info.form.dossier-status"></label>
+                <mat-select
+                    formControlName="dossierStatusId"
+                    [placeholder]="
+                        dossier.dossierStatusId ? (stateService.getById(dossier.dossierStatusId) | async).name : 'No status assigned'
+                    "
+                >
+                    <mat-option *ngFor="let state of states" [value]="dossier.dossierStatusId">
+                        {{ state.name }}
+                    </mat-option>
+                </mat-select>
+            </div>
         </div>
     </div>
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
index 695782375..ad0894822 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
@@ -23,3 +23,7 @@
     border-top: none;
     padding: 0;
 }
+
+.fields-container {
+    flex-direction: column;
+}
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 8b9d48bf1..54ef6987e 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
@@ -14,6 +14,8 @@ import { DossiersService } from '@services/entity-services/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 { DossierState } from '../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 import { DOSSIER_TEMPLATE_ID } from '@utils/constants';
 
 @Component({
@@ -29,9 +31,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     form: FormGroup;
     hasDueDate: boolean;
     dossierTemplates: IDossierTemplate[];
+    states: DossierState[];
 
     constructor(
         readonly permissionsService: PermissionsService,
+        readonly stateService: DossierStateService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dossiersService: DossiersService,
         private readonly _dossierStatsService: DossierStatsService,
@@ -67,12 +71,13 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         return this.hasDueDate && this.form.get('dueDate').value === null;
     }
 
-    ngOnInit() {
+    async ngOnInit() {
         this._filterInvalidDossierTemplates();
         this.form = this._getForm();
         if (!this.permissionsService.canEditDossier(this.dossier)) {
             this.form.disable();
         }
+        this.states = await firstValueFrom(this.stateService.loadAllForTemplate(this.dossier.dossierTemplateId));
         this.hasDueDate = !!this.dossier.dueDate;
     }
 
@@ -96,6 +101,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
             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,
         } as IDossierRequest;
         try {
             await firstValueFrom(this._dossiersService.createOrUpdate(dossier));
@@ -136,6 +142,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
                 },
                 Validators.required,
             ],
+            dossierStatusId: [this.dossier.dossierStatusId],
             description: [this.dossier.description],
             dueDate: [this.dossier.dueDate],
             watermarkEnabled: [this.dossier.watermarkEnabled],
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html
new file mode 100644
index 000000000..3025a99af
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.html
@@ -0,0 +1 @@
+<iqser-status-bar *ngIf="stats" [configs]="statusBarConfig"></iqser-status-bar>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.scss
new file mode 100644
index 000000000..e69de29bb
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
new file mode 100644
index 000000000..00fc9084f
--- /dev/null
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts
@@ -0,0 +1,24 @@
+import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
+import { DossierStats, StatusSorter } from '../../../../../../../../../../libs/red-domain/src';
+import { List, StatusBarConfig } from '../../../../../../../../../../libs/common-ui/src';
+
+@Component({
+    selector: 'redaction-dossier-documents-status',
+    templateUrl: './dossier-documents-status.component.html',
+    styleUrls: ['./dossier-documents-status.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DossierDocumentsStatusComponent implements OnChanges {
+    @Input() stats: DossierStats;
+    statusBarConfig: List<StatusBarConfig<string>>;
+
+    private get _statusConfig(): List<StatusBarConfig<string>> {
+        const { fileCountPerWorkflowStatus } = this.stats;
+        const statuses = Object.keys(fileCountPerWorkflowStatus).sort(StatusSorter.byStatus);
+        return statuses.map(status => ({ length: fileCountPerWorkflowStatus[status], color: status }));
+    }
+
+    ngOnChanges(): void {
+        this.statusBarConfig = this._statusConfig;
+    }
+}
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 2b521e11f..63bcdbe86 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
@@ -1,6 +1,10 @@
-<iqser-status-bar *ngIf="stats" [configs]="statusBarConfig"></iqser-status-bar>
-
-<div (longPress)="forceReanalysisAction($event)" class="action-buttons" redactionLongPress>
+<div
+    (longPress)="forceReanalysisAction($event)"
+    class="action-buttons"
+    redactionLongPress
+    iqserHelpMode="dossier-features"
+    [updateElementPosition]="false"
+>
     <iqser-circle-button
         (action)="openEditDossierDialog($event, dossier.dossierId)"
         *ngIf="currentUser.isUser"
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 9c93cf143..c76b3e68c 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
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/c
 import { PermissionsService } from '@services/permissions.service';
 import { CircleButtonTypes, List, StatusBarConfig } from '@iqser/common-ui';
 import { UserService } from '@services/user.service';
-import { Dossier, DossierStats, File, StatusSorter } from '@red/domain';
+import { Dossier, DossierStats, File } from '@red/domain';
 import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { LongPressEvent } from '@shared/directives/long-press.directive';
 import { UserPreferenceService } from '@services/user-preference.service';
@@ -39,14 +39,7 @@ export class DossiersListingActionsComponent implements OnChanges {
         private readonly _userPreferenceService: UserPreferenceService,
     ) {}
 
-    private get _statusConfig(): List<StatusBarConfig<string>> {
-        const { fileCountPerWorkflowStatus } = this.stats;
-        const statuses = Object.keys(fileCountPerWorkflowStatus).sort(StatusSorter.byStatus);
-        return statuses.map(status => ({ length: fileCountPerWorkflowStatus[status], color: status }));
-    }
-
     ngOnChanges() {
-        this.statusBarConfig = this._statusConfig;
         this.files = this.filesMapService.get(this.dossier.dossierId);
         this.displayReanalyseBtn = this.permissionsService.displayReanalyseBtn(this.dossier) && this.analysisForced;
     }
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
index 8bc358801..c984f6d6e 100644
--- 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
@@ -1,4 +1,13 @@
-<div class="flex-align-items-center dossier-status-container">
-    <div class="dossier-status-text">{{ dossierState.name }}</div>
-    <div class="dossier-status-chip" [style.background-color]="dossierState.description"></div>
-</div>
+<ng-container *ngIf="dossierState$ | async as dossierState">
+    <div class="flex-align-items-center dossier-status-container">
+        <div class="dossier-status-text">{{ dossierState.name }}</div>
+        <div class="dossier-status-chip" [style.background-color]="dossierState.description"></div>
+    </div>
+</ng-container>
+<ng-container *ngIf="(dossierState$ | async) === null">
+    <div class="flex-align-items-center dossier-status-container">
+        <div class="dossier-status-text">No status assigned</div>
+    </div>
+</ng-container>
+
+<redaction-dossiers-listing-actions [stats]="stats" [dossier]="dossier"></redaction-dossiers-listing-actions>
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 4ec6e70d2..925854463 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,5 +1,8 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
+import { Observable } from 'rxjs';
+import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
 
 @Component({
     selector: 'redaction-dossiers-listing-status',
@@ -7,6 +10,16 @@ import { DossierState } from '../../../../../../../../../../libs/red-domain/src/
     styleUrls: ['./dossiers-listing-status.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossiersListingStatusComponent {
-    @Input() dossierState: DossierState;
+export class DossiersListingStatusComponent implements OnInit {
+    dossierState$: Observable<DossierState>;
+    @Input() stats: DossierStats;
+    @Input() dossier: Dossier;
+
+    constructor(private readonly _dossierStateService: DossierStateService) {}
+
+    ngOnInit(): void {
+        if (this.dossier.dossierStatusId) {
+            this.dossierState$ = this._dossierStateService.getById(this.dossier.dossierStatusId);
+        }
+    }
 }
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 9a8bc9a43..90e29ab9a 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
@@ -12,10 +12,10 @@
     </div>
 
     <div class="cell status-container">
-        <redaction-dossiers-listing-actions [dossier]="dossier" [stats]="stats"></redaction-dossiers-listing-actions>
+        <redaction-dossier-documents-status [stats]="stats"></redaction-dossier-documents-status>
     </div>
 
     <div class="cell">
-        <redaction-dossiers-listing-status [dossierState]="states[0]"></redaction-dossiers-listing-status>
+        <redaction-dossiers-listing-status [stats]="stats" [dossier]="dossier"></redaction-dossiers-listing-status>
     </div>
 </ng-container>
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 b6c66da48..d1e991d3c 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,10 +1,8 @@
-import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Dossier, DossierStats } from '@red/domain';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
-import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
-import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 
 @Component({
     selector: 'redaction-table-item [dossier]',
@@ -12,14 +10,13 @@ import { DossierState } from '../../../../../../../../../../libs/red-domain/src/
     styleUrls: ['./table-item.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class TableItemComponent implements OnChanges, OnInit {
+export class TableItemComponent implements OnChanges {
     @Input() dossier!: Dossier;
-    states: DossierState[];
 
     readonly stats$: Observable<DossierStats>;
     private readonly _ngOnChanges$ = new BehaviorSubject<string>(undefined);
 
-    constructor(readonly dossierStatsService: DossierStatsService, readonly dossierStateService: DossierStateService) {
+    constructor(readonly dossierStatsService: DossierStatsService) {
         this.stats$ = this._ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId)));
     }
 
@@ -28,9 +25,4 @@ export class TableItemComponent implements OnChanges, OnInit {
             this._ngOnChanges$.next(this.dossier.dossierId);
         }
     }
-
-    async ngOnInit(): Promise<void> {
-        this.states = await firstValueFrom(this.dossierStateService.loadAllForTemplate('b3413395-8511-4a45-b0eb-b103012b4d8a'));
-        console.log(this.states);
-    }
 }
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 01490f1bd..29af016b3 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
@@ -13,6 +13,7 @@ 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 = [
     {
@@ -32,6 +33,7 @@ const routes: Routes = [
         DossierWorkloadColumnComponent,
         TableItemComponent,
         DossiersListingStatusComponent,
+        DossierDocumentsStatusComponent,
     ],
     providers: [ConfigService],
     imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 42a3ce3ff..4898fb78f 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1008,6 +1008,7 @@
           "placeholder": "Enter Description"
         },
         "due-date": "Due Date",
+        "dossier-status": "Dossier Status",
         "name": {
           "label": "Dossier Name",
           "placeholder": "Enter Name"

From 0180bf0119f1669039c3307a35ea6e7d8ab39e24 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 7 Feb 2022 15:16:35 +0200
Subject: [PATCH 10/33] load all states when loading dossiers and templates

---
 apps/red-ui/src/app/guards/dossiers.guard.ts  |  1 +
 ...delete-dossier-state-dialog.component.html |  7 ++---
 ...m-delete-dossier-state-dialog.component.ts | 13 ++++----
 ...dossier-states-listing-screen.component.ts | 10 ++----
 .../edit-dossier-general-info.component.html  | 31 ++++++++++---------
 .../edit-dossier-general-info.component.scss  |  8 +++++
 .../edit-dossier-general-info.component.ts    |  8 +++--
 .../dossiers-listing-status.component.html    | 10 +++---
 .../dossiers-listing-status.component.scss    |  5 +--
 .../dossiers-listing-status.component.ts      |  7 ++---
 .../entity-services/dossier-state.service.ts  | 17 ++++++++--
 .../entity-services/dossiers.service.ts       |  3 ++
 apps/red-ui/src/assets/i18n/en.json           |  6 ++--
 13 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts
index 7f056bf71..59d87d968 100644
--- a/apps/red-ui/src/app/guards/dossiers.guard.ts
+++ b/apps/red-ui/src/app/guards/dossiers.guard.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { firstValueFrom } from 'rxjs';
+import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 
 @Injectable({ providedIn: 'root' })
 export class DossiersGuard implements CanActivate {
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index ff36577ae..0d2dc5004 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -13,8 +13,8 @@
                 <div class="iqser-input-group required w-300">
                     <label translate="confirm-delete-dossier-state.form.status"></label>
                     <mat-select
-                        formControlName="replaceDossierStatusId"
                         [placeholder]="'confirm-delete-dossier-state.form.status-placeholder' | translate"
+                        formControlName="replaceDossierStatusId"
                     >
                         <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
                             {{ state.name }}
@@ -26,10 +26,7 @@
     </div>
 
     <div class="dialog-actions">
-        <button (click)="dialogRef.close(true)" color="primary" mat-flat-button>
-            {{ 'confirm-delete-dossier-state.delete-only' | translate }}
-        </button>
-        <button (click)="dialogRef.close(replaceDossierStatusId)" mat-flat-button [disabled]="!replaceDossierStatusId">
+        <button (click)="dialogRef.close(replaceDossierStatusId)" [disabled]="!replaceDossierStatusId" mat-flat-button>
             {{ 'confirm-delete-dossier-state.delete-replace' | translate }}
         </button>
         <div (click)="dialogRef.close()" [translate]="'confirm-delete-dossier-state.cancel'" class="all-caps-label cancel"></div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index d80ece9ad..547990732 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -24,13 +24,6 @@ export class ConfirmDeleteDossierStateDialogComponent {
         @Inject(MAT_DIALOG_DATA) public data: DialogData,
     ) {
         this.form = this._getForm();
-        console.log(data);
-    }
-
-    private _getForm(): FormGroup {
-        return this._formBuilder.group({
-            replaceDossierStatusId: [null],
-        });
     }
 
     get translateArgs() {
@@ -43,4 +36,10 @@ export class ConfirmDeleteDossierStateDialogComponent {
     get replaceDossierStatusId(): string {
         return this.form.get('replaceDossierStatusId').value;
     }
+
+    private _getForm(): FormGroup {
+        return this._formBuilder.group({
+            replaceDossierStatusId: [null],
+        });
+    }
 }
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 d3230e1e0..6c0f26378 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
@@ -73,13 +73,9 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             otherStates: this.entitiesService.all.filter(state => state.dossierStatusId !== dossierState.dossierStatusId),
             dossierCount: this._getDossiersWithStateAndTemplateCount(dossierState.dossierStatusId, templateId),
         };
-        this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string | true) => {
+        this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string) => {
             if (value) {
-                if (value === true) {
-                    console.log('asteptam');
-                } else {
-                    await firstValueFrom(this._dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
-                }
+                await firstValueFrom(this._dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
             }
 
             await this._appStateService.refreshDossierTemplate(templateId);
@@ -104,7 +100,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
 
         try {
             const templateId = this._dossierTemplatesService.activeDossierTemplateId;
-            const dossierStates = await firstValueFrom(this._dossierStateService.loadAllForTemplate(templateId));
+            const dossierStates = this._dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
             dossierStates.forEach(state => {
                 state.dossierCount = this._getDossiersWithStateAndTemplateCount(state.dossierStatusId, templateId);
             });
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 a470c6ca0..f04c6730a 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
@@ -53,6 +53,23 @@
         </div>
 
         <div class="flex fields-container">
+            <div class="iqser-input-group w-300">
+                <label translate="edit-dossier-dialog.general-info.form.dossier-status.label"></label>
+                <mat-select
+                    [placeholder]="
+                        currentStatus ? currentStatus.name : ('edit-dossier-dialog.general-info.form.dossier-status.label' | translate)
+                    "
+                    formControlName="dossierStatusId"
+                >
+                    <mat-option *ngFor="let state of states" [value]="state.dossierStatusId">
+                        <div class="flex-align-items-center">
+                            <redaction-small-chip [color]="state.description"></redaction-small-chip>
+                            <div>{{ state.name }}</div>
+                        </div>
+                    </mat-option>
+                </mat-select>
+            </div>
+
             <div class="due-date">
                 <mat-checkbox
                     (change)="hasDueDate = !hasDueDate"
@@ -72,20 +89,6 @@
                     <mat-datepicker #picker></mat-datepicker>
                 </div>
             </div>
-
-            <div class="iqser-input-group required w-300">
-                <label translate="edit-dossier-dialog.general-info.form.dossier-status"></label>
-                <mat-select
-                    formControlName="dossierStatusId"
-                    [placeholder]="
-                        dossier.dossierStatusId ? (stateService.getById(dossier.dossierStatusId) | async).name : 'No status assigned'
-                    "
-                >
-                    <mat-option *ngFor="let state of states" [value]="dossier.dossierStatusId">
-                        {{ state.name }}
-                    </mat-option>
-                </mat-select>
-            </div>
         </div>
     </div>
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
index ad0894822..cadbd6f7a 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.scss
@@ -26,4 +26,12 @@
 
 .fields-container {
     flex-direction: column;
+
+    &:first-child {
+        margin-right: 40px;
+    }
+}
+
+redaction-small-chip {
+    margin-right: 8px;
 }
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 54ef6987e..bf200a3bf 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
@@ -32,10 +32,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     hasDueDate: boolean;
     dossierTemplates: IDossierTemplate[];
     states: DossierState[];
+    currentStatus: DossierState;
 
     constructor(
         readonly permissionsService: PermissionsService,
-        readonly stateService: DossierStateService,
+        private readonly _dossierStateService: DossierStateService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dossiersService: DossiersService,
         private readonly _dossierStatsService: DossierStatsService,
@@ -77,7 +78,10 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         if (!this.permissionsService.canEditDossier(this.dossier)) {
             this.form.disable();
         }
-        this.states = await firstValueFrom(this.stateService.loadAllForTemplate(this.dossier.dossierTemplateId));
+        this.states = this._dossierStateService.all.filter(s => s.dossierTemplateId === this.dossier.dossierTemplateId);
+        if (this.dossier.dossierStatusId) {
+            this.currentStatus = this._dossierStateService.all.find(s => s.dossierStatusId === this.dossier.dossierStatusId);
+        }
         this.hasDueDate = !!this.dossier.dueDate;
     }
 
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
index c984f6d6e..3624dd196 100644
--- 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
@@ -1,13 +1,13 @@
-<ng-container *ngIf="dossierState$ | async as dossierState">
+<ng-container *ngIf="dossier.dossierStatusId">
     <div class="flex-align-items-center dossier-status-container">
-        <div class="dossier-status-text">{{ dossierState.name }}</div>
-        <div class="dossier-status-chip" [style.background-color]="dossierState.description"></div>
+        <div class="dossier-status-text">{{ currentState.name }}</div>
+        <redaction-small-chip [color]="currentState.description"></redaction-small-chip>
     </div>
 </ng-container>
-<ng-container *ngIf="(dossierState$ | async) === null">
+<ng-container *ngIf="!dossier.dossierStatusId">
     <div class="flex-align-items-center dossier-status-container">
         <div class="dossier-status-text">No status assigned</div>
     </div>
 </ng-container>
 
-<redaction-dossiers-listing-actions [stats]="stats" [dossier]="dossier"></redaction-dossiers-listing-actions>
+<redaction-dossiers-listing-actions [dossier]="dossier" [stats]="stats"></redaction-dossiers-listing-actions>
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss
index 0c4471d56..7d5a74298 100644
--- 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.scss
@@ -5,10 +5,7 @@
     width: 100%;
 }
 
-.dossier-status-chip {
-    width: 12px;
-    height: 6px;
-    border-radius: 6px;
+redaction-small-chip {
     margin-left: 8px;
 }
 
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 925854463..385a727bb 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
-import { Observable } from 'rxjs';
 import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
+import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 
 @Component({
     selector: 'redaction-dossiers-listing-status',
@@ -11,15 +10,15 @@ import { DossierStateService } from '../../../../../../services/entity-services/
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DossiersListingStatusComponent implements OnInit {
-    dossierState$: Observable<DossierState>;
     @Input() stats: DossierStats;
     @Input() dossier: Dossier;
+    currentState: DossierState;
 
     constructor(private readonly _dossierStateService: DossierStateService) {}
 
     ngOnInit(): void {
         if (this.dossier.dossierStatusId) {
-            this.dossierState$ = this._dossierStateService.getById(this.dossier.dossierStatusId);
+            this.currentState = this._dossierStateService.all.find(s => s.dossierStatusId === this.dossier.dossierStatusId);
         }
     }
 }
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 b5d3f8608..5a8218cfa 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
@@ -1,13 +1,15 @@
 import { Injectable, Injector } from '@angular/core';
-import { EntitiesService, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
+import { EntitiesService, mapEach, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
 import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
-import { Observable } from 'rxjs';
+import { forkJoin, Observable, switchMap } from 'rxjs';
+import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
+import { map } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root',
 })
 export class DossierStateService extends EntitiesService<DossierState, IDossierState> {
-    constructor(protected readonly _injector: Injector) {
+    constructor(protected readonly _injector: Injector, private readonly _dossierTemplatesService: DossierTemplatesService) {
         super(_injector, DossierState, 'dossier-status');
     }
 
@@ -21,6 +23,15 @@ export class DossierStateService extends EntitiesService<DossierState, IDossierS
         return this.loadAll(`${this._defaultModelPath}/dossier-template/${templateId}`);
     }
 
+    loadAllForAllTemplates(): Observable<DossierState[]> {
+        return this._dossierTemplatesService.all$.pipe(
+            mapEach(template => template.dossierTemplateId),
+            mapEach(id => this.loadAllForTemplate(id)),
+            switchMap(all => forkJoin(all)),
+            map(value => value.flatMap(item => item)),
+        );
+    }
+
     @Validate()
     deleteAndReplace(@RequiredParam() dossierStatusId: string, @RequiredParam() replaceDossierStatusId: string) {
         const url = `${this._defaultModelPath}/${dossierStatusId}?replaceDossierStatusId=${replaceDossierStatusId}`;
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 0babadb88..7760c7a7d 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
@@ -7,6 +7,7 @@ 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';
 
 export interface IDossiersStats {
     totalPeople: number;
@@ -37,6 +38,7 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
         private readonly _toaster: Toaster,
         protected readonly _injector: Injector,
         private readonly _dossierStatsService: DossierStatsService,
+        private readonly _dossierStateService: DossierStateService,
     ) {
         super(_injector, Dossier, 'dossier');
 
@@ -54,6 +56,7 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
             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)),
         );
     }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 4898fb78f..d7c7a9173 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -429,7 +429,6 @@
       "status": "Replace Status",
       "status-placeholder": "Choose another status"
     },
-    "delete-only": "Delete Only",
     "delete-replace": "Delete and Replace",
     "cancel": "Cancel"
   },
@@ -1008,7 +1007,10 @@
           "placeholder": "Enter Description"
         },
         "due-date": "Due Date",
-        "dossier-status": "Dossier Status",
+        "dossier-status": {
+          "label": "Dossier Status",
+          "placeholder": "No status assigned"
+        },
         "name": {
           "label": "Dossier Name",
           "placeholder": "Enter Name"

From 6721c751202293eda47d53e5623428a12b3a78ea Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Wed, 9 Feb 2022 13:17:42 +0200
Subject: [PATCH 11/33] fixed loadstates when loading dossiers bugs

---
 apps/red-ui/src/app/guards/dossiers.guard.ts     |  1 -
 .../app/modules/admin/admin-routing.module.ts    |  3 ++-
 .../dossier-states-listing-screen.component.ts   | 16 +++++++---------
 .../edit-dossier-general-info.component.html     |  2 +-
 .../edit-dossier-general-info.component.ts       |  1 +
 .../dossiers-listing-status.component.ts         |  6 +++---
 .../entity-services/dossier-state.service.ts     |  3 ++-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/red-ui/src/app/guards/dossiers.guard.ts b/apps/red-ui/src/app/guards/dossiers.guard.ts
index 59d87d968..7f056bf71 100644
--- a/apps/red-ui/src/app/guards/dossiers.guard.ts
+++ b/apps/red-ui/src/app/guards/dossiers.guard.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { firstValueFrom } from 'rxjs';
-import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 
 @Injectable({ providedIn: 'root' })
 export class DossiersGuard implements CanActivate {
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 6ce27d21f..71dc59af3 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
@@ -22,6 +22,7 @@ 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 { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
+import { DossiersGuard } from '../../guards/dossiers.guard';
 
 const routes: Routes = [
     { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' },
@@ -120,7 +121,7 @@ const routes: Routes = [
                         component: DossierStatesListingScreenComponent,
                         canActivate: [CompositeRouteGuard],
                         data: {
-                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
+                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard, DossiersGuard],
                         },
                     },
                     {
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 6c0f26378..f6ee28661 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
@@ -71,13 +71,14 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         const data = {
             toBeDeletedState: dossierState,
             otherStates: this.entitiesService.all.filter(state => state.dossierStatusId !== dossierState.dossierStatusId),
-            dossierCount: this._getDossiersWithStateAndTemplateCount(dossierState.dossierStatusId, templateId),
+            dossierCount: dossierState.dossierCount,
         };
         this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string) => {
             if (value) {
                 await firstValueFrom(this._dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
             }
 
+            await firstValueFrom(this._dossierStateService.loadAllForAllTemplates());
             await this._appStateService.refreshDossierTemplate(templateId);
             await this._loadData();
         });
@@ -91,6 +92,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
                 this._toaster.error(_('dossier-states-listing.error.generic'));
             }
         });
+        await firstValueFrom(this._dossierStateService.loadAllForAllTemplates());
         await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
         await this._loadData();
     }
@@ -101,16 +103,12 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         try {
             const templateId = this._dossierTemplatesService.activeDossierTemplateId;
             const dossierStates = this._dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
-            dossierStates.forEach(state => {
-                state.dossierCount = this._getDossiersWithStateAndTemplateCount(state.dossierStatusId, templateId);
-            });
+            const dossiers = this._dossiersService.all;
+            this._dossierStateService.all.forEach(
+                state => (state.dossierCount = dossiers.filter(dossier => dossier.dossierStatusId === state.dossierStatusId).length),
+            );
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
         this._loadingService.stop();
     }
-
-    private _getDossiersWithStateAndTemplateCount(dossierStatusId: string, templateId: string) {
-        const dossiers = this._dossiersService.all;
-        return dossiers.filter(dossier => dossier.dossierStatusId === dossierStatusId && dossier.dossierTemplateId === templateId).length;
-    }
 }
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 f04c6730a..7f632e2a0 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
@@ -74,7 +74,7 @@
                 <mat-checkbox
                     (change)="hasDueDate = !hasDueDate"
                     [checked]="hasDueDate"
-                    [disabled]="!permissionsService.canEditDossier()"
+                    [disabled]="!permissionsService.canEditDossier(dossier)"
                     class="filter-menu-checkbox"
                     color="primary"
                 >
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 bf200a3bf..16b5cc998 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
@@ -89,6 +89,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         this.form.reset({
             dossierName: this.dossier.dossierName,
             dossierTemplateId: this.dossier.dossierTemplateId,
+            dossierStatusId: this.dossier.dossierStatusId,
             description: this.dossier.description,
             watermarkEnabled: this.dossier.watermarkEnabled,
             watermarkPreviewEnabled: this.dossier.watermarkPreviewEnabled,
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 385a727bb..96710947d 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
 import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
 import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
@@ -9,14 +9,14 @@ import { DossierState } from '../../../../../../../../../../libs/red-domain/src/
     styleUrls: ['./dossiers-listing-status.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossiersListingStatusComponent implements OnInit {
+export class DossiersListingStatusComponent implements OnChanges {
     @Input() stats: DossierStats;
     @Input() dossier: Dossier;
     currentState: DossierState;
 
     constructor(private readonly _dossierStateService: DossierStateService) {}
 
-    ngOnInit(): void {
+    ngOnChanges(): void {
         if (this.dossier.dossierStatusId) {
             this.currentState = this._dossierStateService.all.find(s => s.dossierStatusId === this.dossier.dossierStatusId);
         }
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 5a8218cfa..34adf0566 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
@@ -3,7 +3,7 @@ import { EntitiesService, mapEach, RequiredParam, Validate } from '../../../../.
 import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
 import { forkJoin, Observable, switchMap } from 'rxjs';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root',
@@ -29,6 +29,7 @@ export class DossierStateService extends EntitiesService<DossierState, IDossierS
             mapEach(id => this.loadAllForTemplate(id)),
             switchMap(all => forkJoin(all)),
             map(value => value.flatMap(item => item)),
+            tap(value => this.setEntities(value)),
         );
     }
 

From d53b3b99523bc6d17388071d69bea798f79258cb Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Wed, 9 Feb 2022 14:55:25 +0200
Subject: [PATCH 12/33] added states chart

---
 .../dossier-states-listing-screen.component.html     | 12 +++++++++++-
 .../dossier-states-listing-screen.component.scss     |  4 ++++
 .../dossier-states-listing-screen.component.ts       | 12 ++++++++++++
 .../entity-services/dossier-state.service.ts         |  5 -----
 apps/red-ui/src/assets/i18n/en.json                  |  3 +++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index 045a9d075..84a706e27 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -31,6 +31,16 @@
                 noDataIcon="red:attribute"
             ></iqser-table>
         </div>
+
+        <div class="right-container">
+            <redaction-simple-doughnut-chart
+                [config]="chartData"
+                [radius]="80"
+                [strokeWidth]="15"
+                [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
+                [totalType]="'count'"
+            ></redaction-simple-doughnut-chart>
+        </div>
     </div>
 </section>
 
@@ -55,7 +65,7 @@
     <div *ngIf="cast(entity) as state">
         <div class="cell">
             <div class="flex-align-items-center">
-                <div class="dossier-state-square" [style.background-color]="state.description"></div>
+                <div [style.background-color]="state.description" class="dossier-state-square"></div>
                 <div class="state-name">{{ state.name }}</div>
             </div>
         </div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
index 1df526cd4..ef7a2530e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss
@@ -12,3 +12,7 @@
     line-height: 20px;
     color: variables.$grey-1;
 }
+
+.right-container {
+    padding: 50px 26px 0;
+}
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 f6ee28661..1fe749dfe 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
@@ -18,6 +18,7 @@ import { AdminDialogService } from '../../services/admin-dialog.service';
 import { UserService } from '../../../../services/user.service';
 import { AppStateService } from '../../../../state/app-state.service';
 import { HttpStatusCode } from '@angular/common/http';
+import { DoughnutChartConfig } from '../../../shared/components/simple-doughnut-chart/simple-doughnut-chart.component';
 
 @Component({
     templateUrl: './dossier-states-listing-screen.component.html',
@@ -37,6 +38,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         { label: _('dossier-states-listing.table-col-names.name'), sortByKey: 'searchKey' },
         { label: _('dossier-states-listing.table-col-names.dossiers-count'), sortByKey: 'dossierCount' },
     ];
+    chartData: DoughnutChartConfig[];
 
     constructor(
         protected readonly _injector: Injector,
@@ -107,8 +109,18 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             this._dossierStateService.all.forEach(
                 state => (state.dossierCount = dossiers.filter(dossier => dossier.dossierStatusId === state.dossierStatusId).length),
             );
+            this.chartData = this._loadChartData();
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
         this._loadingService.stop();
     }
+
+    private _loadChartData(): DoughnutChartConfig[] {
+        const config: DoughnutChartConfig[] = [];
+        this._dossierStateService.all.forEach(state => {
+            config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.description });
+        });
+
+        return config;
+    }
 }
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 34adf0566..44a82f9ee 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
@@ -38,9 +38,4 @@ export class DossierStateService extends EntitiesService<DossierState, IDossierS
         const url = `${this._defaultModelPath}/${dossierStatusId}?replaceDossierStatusId=${replaceDossierStatusId}`;
         return this.delete({}, url);
     }
-
-    @Validate()
-    getById(@RequiredParam() id: string): Observable<DossierState> {
-        return this._getOne([id]);
-    }
 }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index d7c7a9173..f2bb02254 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -639,6 +639,9 @@
       "delete": "Delete Status",
       "edit": "Edit Status"
     },
+    "chart": {
+      "dossier-states": "Dossier States"
+    },
     "error": {
       "conflict": "Dossier State with this name already exists!",
       "generic": "Failed to add Dossier State"

From 2b3638a97d3468ee3358fa08e6ddda57a4c15895 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Thu, 10 Feb 2022 13:49:53 +0200
Subject: [PATCH 13/33] fixed chart legend labels

---
 .../dossier-states-listing-screen.component.html       |  2 +-
 .../simple-doughnut-chart.component.ts                 | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index 84a706e27..21f948e7f 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -38,7 +38,7 @@
                 [radius]="80"
                 [strokeWidth]="15"
                 [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
-                [totalType]="'count'"
+                [totalType]="'simpleLabel'"
             ></redaction-simple-doughnut-chart>
         </div>
     </div>
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
index ec11bf6e7..bbe3ff3d9 100644
--- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
@@ -23,7 +23,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit {
     @Input() radius = 85;
     @Input() strokeWidth = 20;
     @Input() direction: 'row' | 'column' = 'column';
-    @Input() totalType: 'sum' | 'count' = 'sum';
+    @Input() totalType: 'sum' | 'count' | 'simpleLabel' = 'sum';
     @Input() counterText: string;
     @Input() filterKey = 'statusFilters';
     filtersEnabled: boolean;
@@ -51,7 +51,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit {
     }
 
     get displayedDataTotal() {
-        return this.totalType === 'sum' ? this.dataTotal : this.config.length;
+        return this.totalType === 'count' ? this.config.length : this.dataTotal;
     }
 
     ngOnInit() {
@@ -96,7 +96,11 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit {
     }
 
     getLabel({ label, value }: DoughnutChartConfig): string {
-        return this.totalType === 'sum' ? `${value} ${label}` : `${label} (${value} ${this.counterText})`;
+        return this.totalType === 'simpleLabel'
+            ? `${label}`
+            : this.totalType === 'sum'
+            ? `${value} ${label}`
+            : `${label} (${value} ${this.counterText})`;
     }
 
     selectValue(key: string): void {

From 860cc91abc1e9ae96b338f8406eae365cd1c94e2 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Fri, 11 Feb 2022 14:59:49 +0200
Subject: [PATCH 14/33] fixed doughnut charts

---
 .../app/modules/admin/admin-routing.module.ts |   3 +-
 ...delete-dossier-state-dialog.component.html |   2 +-
 ...ssier-states-listing-screen.component.html | 180 +++++++++---------
 ...dossier-states-listing-screen.component.ts |  26 +--
 .../edit-dossier-general-info.component.html  |   4 +-
 .../dossiers-listing-details.component.ts     |  22 ++-
 .../simple-doughnut-chart.component.ts        |   2 +-
 .../entity-services/dossiers.service.ts       |  16 +-
 8 files changed, 143 insertions(+), 112 deletions(-)

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 71dc59af3..6ce27d21f 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
@@ -22,7 +22,6 @@ 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 { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
-import { DossiersGuard } from '../../guards/dossiers.guard';
 
 const routes: Routes = [
     { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' },
@@ -121,7 +120,7 @@ const routes: Routes = [
                         component: DossierStatesListingScreenComponent,
                         canActivate: [CompositeRouteGuard],
                         data: {
-                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard, DossiersGuard],
+                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
                         },
                     },
                     {
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 0d2dc5004..174896a32 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -26,7 +26,7 @@
     </div>
 
     <div class="dialog-actions">
-        <button (click)="dialogRef.close(replaceDossierStatusId)" [disabled]="!replaceDossierStatusId" mat-flat-button>
+        <button (click)="dialogRef.close(replaceDossierStatusId)" color="primary" [disabled]="!replaceDossierStatusId" mat-flat-button>
             {{ 'confirm-delete-dossier-state.delete-replace' | translate }}
         </button>
         <div (click)="dialogRef.close()" [translate]="'confirm-delete-dossier-state.cancel'" class="all-caps-label cancel"></div>
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index 21f948e7f..eff14a34f 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -1,94 +1,98 @@
-<section>
-    <div class="page-header">
-        <redaction-dossier-template-breadcrumbs class="flex-1"></redaction-dossier-template-breadcrumbs>
+<ng-container *ngIf="dossierStateService.all">
+    <section>
+        <div class="page-header">
+            <redaction-dossier-template-breadcrumbs class="flex-1"></redaction-dossier-template-breadcrumbs>
 
-        <div class="actions flex-1">
-            <redaction-dossier-template-actions></redaction-dossier-template-actions>
+            <div class="actions flex-1">
+                <redaction-dossier-template-actions></redaction-dossier-template-actions>
 
-            <iqser-circle-button
-                [routerLink]="['../..']"
-                [tooltip]="'common.close' | translate"
-                icon="iqser:close"
-                tooltipPosition="below"
-            ></iqser-circle-button>
-        </div>
-    </div>
-
-    <div class="content-inner">
-        <div class="overlay-shadow"></div>
-
-        <redaction-admin-side-nav type="dossierTemplates"></redaction-admin-side-nav>
-
-        <div class="content-container">
-            <iqser-table
-                [headerTemplate]="headerTemplate"
-                [itemSize]="80"
-                [noDataText]="'dossier-states-listing.no-data.title' | translate"
-                [noMatchText]="'dossier-states-listing.no-match.title' | translate"
-                [selectionEnabled]="true"
-                [tableColumnConfigs]="tableColumnConfigs"
-                emptyColumnWidth="1fr"
-                noDataIcon="red:attribute"
-            ></iqser-table>
-        </div>
-
-        <div class="right-container">
-            <redaction-simple-doughnut-chart
-                [config]="chartData"
-                [radius]="80"
-                [strokeWidth]="15"
-                [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
-                [totalType]="'simpleLabel'"
-            ></redaction-simple-doughnut-chart>
-        </div>
-    </div>
-</section>
-
-<ng-template #headerTemplate>
-    <div class="table-header-actions">
-        <iqser-input-with-action
-            [(value)]="searchService.searchValue"
-            [placeholder]="'dossier-states-listing.search' | translate"
-        ></iqser-input-with-action>
-
-        <iqser-icon-button
-            (action)="openAddEditStateDialog($event)"
-            *ngIf="currentUser.isAdmin"
-            [label]="'dossier-states-listing.add-new' | translate"
-            [type]="iconButtonTypes.primary"
-            icon="iqser:plus"
-        ></iqser-icon-button>
-    </div>
-</ng-template>
-
-<ng-template #tableItemTemplate let-entity="entity">
-    <div *ngIf="cast(entity) as state">
-        <div class="cell">
-            <div class="flex-align-items-center">
-                <div [style.background-color]="state.description" class="dossier-state-square"></div>
-                <div class="state-name">{{ state.name }}</div>
-            </div>
-        </div>
-
-        <div class="cell small-label">
-            <span>{{ state.dossierCount }}</span>
-        </div>
-
-        <div class="cell">
-            <div *ngIf="currentUser.isAdmin" class="action-buttons">
                 <iqser-circle-button
-                    (action)="openAddEditStateDialog($event, state)"
-                    [tooltip]="'dossier-states-listing.action.edit' | translate"
-                    [type]="circleButtonTypes.dark"
-                    icon="iqser:edit"
-                ></iqser-circle-button>
-                <iqser-circle-button
-                    (action)="openConfirmDeleteStateDialog($event, state)"
-                    [tooltip]="'dossier-states-listing.action.delete' | translate"
-                    [type]="circleButtonTypes.dark"
-                    icon="iqser:trash"
+                    [routerLink]="['../..']"
+                    [tooltip]="'common.close' | translate"
+                    icon="iqser:close"
+                    tooltipPosition="below"
                 ></iqser-circle-button>
             </div>
         </div>
-    </div>
-</ng-template>
+
+        <div class="content-inner">
+            <div class="overlay-shadow"></div>
+
+            <redaction-admin-side-nav type="dossierTemplates"></redaction-admin-side-nav>
+
+            <div class="content-container">
+                <iqser-table
+                    [headerTemplate]="headerTemplate"
+                    [itemSize]="80"
+                    [noDataText]="'dossier-states-listing.no-data.title' | translate"
+                    [noMatchText]="'dossier-states-listing.no-match.title' | translate"
+                    [selectionEnabled]="true"
+                    [tableColumnConfigs]="tableColumnConfigs"
+                    emptyColumnWidth="1fr"
+                    noDataIcon="red:attribute"
+                ></iqser-table>
+            </div>
+
+            <div class="right-container">
+                <ng-container *ngIf="chartData">
+                    <redaction-simple-doughnut-chart
+                        [config]="chartData"
+                        [radius]="80"
+                        [strokeWidth]="15"
+                        [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
+                        [totalType]="'simpleLabel'"
+                    ></redaction-simple-doughnut-chart>
+                </ng-container>
+            </div>
+        </div>
+    </section>
+
+    <ng-template #headerTemplate>
+        <div class="table-header-actions">
+            <iqser-input-with-action
+                [(value)]="searchService.searchValue"
+                [placeholder]="'dossier-states-listing.search' | translate"
+            ></iqser-input-with-action>
+
+            <iqser-icon-button
+                (action)="openAddEditStateDialog($event)"
+                *ngIf="currentUser.isAdmin"
+                [label]="'dossier-states-listing.add-new' | translate"
+                [type]="iconButtonTypes.primary"
+                icon="iqser:plus"
+            ></iqser-icon-button>
+        </div>
+    </ng-template>
+
+    <ng-template #tableItemTemplate let-entity="entity">
+        <div *ngIf="cast(entity) as state">
+            <div class="cell">
+                <div class="flex-align-items-center">
+                    <div [style.background-color]="state.description" class="dossier-state-square"></div>
+                    <div class="state-name">{{ state.name }}</div>
+                </div>
+            </div>
+
+            <div class="cell small-label">
+                <span>{{ state.dossierCount }}</span>
+            </div>
+
+            <div class="cell">
+                <div *ngIf="currentUser.isAdmin" class="action-buttons">
+                    <iqser-circle-button
+                        (action)="openAddEditStateDialog($event, state)"
+                        [tooltip]="'dossier-states-listing.action.edit' | translate"
+                        [type]="circleButtonTypes.dark"
+                        icon="iqser:edit"
+                    ></iqser-circle-button>
+                    <iqser-circle-button
+                        (action)="openConfirmDeleteStateDialog($event, state)"
+                        [tooltip]="'dossier-states-listing.action.delete' | translate"
+                        [type]="circleButtonTypes.dark"
+                        icon="iqser:trash"
+                    ></iqser-circle-button>
+                </div>
+            </div>
+        </div>
+    </ng-template>
+</ng-container>
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 1fe749dfe..3b532f3e0 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
@@ -44,7 +44,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         protected readonly _injector: Injector,
         private readonly _loadingService: LoadingService,
         private readonly _dossiersService: DossiersService,
-        private readonly _dossierStateService: DossierStateService,
+        readonly dossierStateService: DossierStateService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dialogService: AdminDialogService,
         private readonly _userService: UserService,
@@ -77,38 +77,34 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         };
         this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string) => {
             if (value) {
-                await firstValueFrom(this._dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
+                await firstValueFrom(this.dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
             }
 
-            await firstValueFrom(this._dossierStateService.loadAllForAllTemplates());
             await this._appStateService.refreshDossierTemplate(templateId);
             await this._loadData();
         });
     }
 
     private async _createNewDossierStateAndRefreshView(newValue: IDossierState): Promise<void> {
-        await firstValueFrom(this._dossierStateService.setDossierState(newValue)).catch(error => {
+        await firstValueFrom(this.dossierStateService.setDossierState(newValue)).catch(error => {
             if (error.status === HttpStatusCode.Conflict) {
                 this._toaster.error(_('dossier-states-listing.error.conflict'));
             } else {
                 this._toaster.error(_('dossier-states-listing.error.generic'));
             }
         });
-        await firstValueFrom(this._dossierStateService.loadAllForAllTemplates());
         await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
         await this._loadData();
     }
 
-    private async _loadData() {
+    private async _loadData(): Promise<void> {
         this._loadingService.start();
+        await firstValueFrom(this._dossiersService.loadAll());
 
         try {
             const templateId = this._dossierTemplatesService.activeDossierTemplateId;
-            const dossierStates = this._dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
-            const dossiers = this._dossiersService.all;
-            this._dossierStateService.all.forEach(
-                state => (state.dossierCount = dossiers.filter(dossier => dossier.dossierStatusId === state.dossierStatusId).length),
-            );
+            const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
+            this._setStatesCount();
             this.chartData = this._loadChartData();
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
@@ -117,10 +113,16 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
 
     private _loadChartData(): DoughnutChartConfig[] {
         const config: DoughnutChartConfig[] = [];
-        this._dossierStateService.all.forEach(state => {
+        this.dossierStateService.all.forEach(state => {
             config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.description });
         });
 
         return config;
     }
+
+    private _setStatesCount(): void {
+        this.dossierStateService.all.forEach(
+            state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId)),
+        );
+    }
 }
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 7f632e2a0..7faada51b 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
@@ -57,7 +57,9 @@
                 <label translate="edit-dossier-dialog.general-info.form.dossier-status.label"></label>
                 <mat-select
                     [placeholder]="
-                        currentStatus ? currentStatus.name : ('edit-dossier-dialog.general-info.form.dossier-status.label' | translate)
+                        currentStatus
+                            ? currentStatus.name
+                            : ('edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate)
                     "
                     formControlName="dossierStatusId"
                 >
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 68f053b36..d27fd37e3 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
@@ -7,8 +7,9 @@ import { Dossier, DossierStats, FileCountPerWorkflowStatus, StatusSorter } from
 import { workflowFileStatusTranslations } from '../../../../translations/file-status-translations';
 import { TranslateChartService } from '@services/translate-chart.service';
 import { filter, map, switchMap } from 'rxjs/operators';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
+import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
     selector: 'redaction-dossiers-listing-details',
@@ -25,6 +26,8 @@ export class DossiersListingDetailsComponent {
         readonly dossiersService: DossiersService,
         private readonly _dossierStatsMap: DossierStatsService,
         private readonly _translateChartService: TranslateChartService,
+        private readonly _dossierStateService: DossierStateService,
+        private readonly _translateService: TranslateService,
     ) {
         this.documentsChartData$ = this.dossiersService.all$.pipe(
             mapEach(dossier => _dossierStatsMap.watch$(dossier.dossierId)),
@@ -37,12 +40,19 @@ export class DossiersListingDetailsComponent {
     }
 
     private async _toDossierChartData(dossiers: Dossier[]): Promise<DoughnutChartConfig[]> {
+        const config: DoughnutChartConfig[] = [];
+        this._dossierStateService.all.forEach(state => {
+            state.dossierCount = this.dossiersService.getCountWithState(state.dossierStatusId);
+            config.push({ value: state.dossierCount, label: state.name, color: state.description });
+        });
+        const notAssignedLength = this.dossiersService.all.length - config.map(v => v.value).reduce((acc, val) => acc + val, 0);
+        config.push({
+            value: notAssignedLength,
+            label: this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder'),
+            color: '#D8DAE0',
+        });
         // TODO: deleted dossiers count should come with stats
-        // const deletedDossiers = await this.dossiersService.getDeleted();
-        return [
-            { value: dossiers.length, color: 'ACTIVE', label: _('active') },
-            // { value: deletedDossiers.length, color: 'DELETED', label: _('archived') },
-        ];
+        return config;
     }
 
     private _toChartData(stats: DossierStats[]) {
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
index bbe3ff3d9..ccea0ce17 100644
--- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
@@ -51,7 +51,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit {
     }
 
     get displayedDataTotal() {
-        return this.totalType === 'count' ? this.config.length : this.dataTotal;
+        return this.totalType === 'sum' ? this.dataTotal : this.config.length;
     }
 
     ngOnInit() {
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 7760c7a7d..234707713 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
@@ -62,7 +62,17 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
     }
 
     loadAllIfChanged(): Observable<ChangesDetails> {
-        return this.hasChangesDetails$().pipe(switchMap(changes => this.loadAll().pipe(mapTo(changes))));
+        return this.hasChangesDetails$().pipe(
+            catchError(err => {
+                console.log('aaa', err);
+                return of(err);
+            }),
+            switchMap(changes => this.loadAll().pipe(mapTo(changes))),
+            catchError(err => {
+                console.log('bbb', err);
+                return of(err);
+            }),
+        );
     }
 
     hasChangesDetails$(): Observable<ChangesDetails> {
@@ -111,6 +121,10 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
         return firstValueFrom(super.delete(body, 'deleted-dossiers/hard-delete', body));
     }
 
+    getCountWithState(dossierStatusId: string): number {
+        return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length;
+    }
+
     private _emitFileChanges(changes: ChangesDetails): void {
         changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId));
     }

From 408af932073f8b01fdd5c73b7063487831115955 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Sun, 13 Feb 2022 11:44:13 +0200
Subject: [PATCH 15/33] added separator between doughnut charts

---
 .../dossiers-listing-actions.component.html   |   8 +-
 .../dossiers-listing-details.component.html   |   2 +-
 .../dossiers-listing-details.component.scss   |   4 +
 apps/red-ui/src/assets/i18n/en.json           | 114 +++++++++---------
 4 files changed, 62 insertions(+), 66 deletions(-)

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 63bcdbe86..d0a5803d2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html
@@ -1,10 +1,4 @@
-<div
-    (longPress)="forceReanalysisAction($event)"
-    class="action-buttons"
-    redactionLongPress
-    iqserHelpMode="dossier-features"
-    [updateElementPosition]="false"
->
+<div (longPress)="forceReanalysisAction($event)" class="action-buttons" redactionLongPress>
     <iqser-circle-button
         (action)="openEditDossierDialog($event, dossier.dossierId)"
         *ngIf="currentUser.isUser"
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 1371e0061..75ad9ceb1 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
@@ -26,7 +26,7 @@
     </div>
 </div>
 
-<div>
+<div class="right-chart">
     <redaction-simple-doughnut-chart
         *ngIf="documentsChartData$ | async as config"
         [config]="config"
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss
index f0e54ada6..b5a1b4580 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.scss
@@ -29,3 +29,7 @@
         }
     }
 }
+
+.right-chart {
+    border-left: 1px solid rgba(226, 228, 233, 0.9);
+}
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index f2bb02254..bcc13bfb7 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -8,7 +8,6 @@
     "all": "All",
     "none": "None"
   },
-  "active": "Active",
   "add-dossier-dialog": {
     "actions": {
       "save": "Save",
@@ -72,6 +71,16 @@
     "save": "Save Attribute",
     "title": "{type, select, edit{Edit {name}} create{Add New} other{}} Dossier Attribute"
   },
+  "add-edit-dossier-state": {
+    "form": {
+      "description": "Hex Color",
+      "description-placeholder": "#",
+      "name": "Status Name",
+      "name-placeholder": "Enter Name"
+    },
+    "save": "Save Status",
+    "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Status"
+  },
   "add-edit-dossier-template": {
     "error": {
       "conflict": "Failed to create dossier template: a dossier template with the same name already exists.",
@@ -88,16 +97,6 @@
     "save": "Save Dossier Template",
     "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Template"
   },
-  "add-edit-dossier-state": {
-    "form": {
-      "name": "Status Name",
-      "name-placeholder": "Enter Name",
-      "description": "Hex Color",
-      "description-placeholder": "#"
-    },
-    "save": "Save Status",
-    "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Status"
-  },
   "add-edit-file-attribute": {
     "form": {
       "column-header": "CSV Column Header",
@@ -409,6 +408,17 @@
     }
   },
   "configurations": "Configurations",
+  "confirm-delete-dossier-state": {
+    "cancel": "Cancel",
+    "delete-replace": "Delete and Replace",
+    "form": {
+      "status": "Replace Status",
+      "status-placeholder": "Choose another status"
+    },
+    "suggestion": "Would you like to replace the states of the Dossiers with another status?",
+    "title": "Delete Dossier Status",
+    "warning": "The {name} status is assigned to {count} Dossiers."
+  },
   "confirm-delete-file-attribute": {
     "cancel": "Keep {type, select, single{Attribute} bulk{Attributes} other{}}",
     "delete": "Delete {type, select, single{Attribute} bulk{Attributes} other{}}",
@@ -421,17 +431,6 @@
     "toast-error": "Please confirm that you understand the ramifications of your action!",
     "warning": "Warning: this cannot be undone!"
   },
-  "confirm-delete-dossier-state": {
-    "title": "Delete Dossier Status",
-    "warning": "The {name} status is assigned to {count} Dossiers.",
-    "suggestion": "Would you like to replace the states of the Dossiers with another status?",
-    "form": {
-      "status": "Replace Status",
-      "status-placeholder": "Choose another status"
-    },
-    "delete-replace": "Delete and Replace",
-    "cancel": "Cancel"
-  },
   "confirm-delete-users": {
     "cancel": "Keep {usersCount, plural, one{User} other{Users}}",
     "delete": "Delete {usersCount, plural, one{User} other{Users}}",
@@ -633,36 +632,6 @@
     "title": "Introduce File Attributes"
   },
   "dossier": "Dossier",
-  "dossier-states": "Dossier States",
-  "dossier-states-listing": {
-    "action": {
-      "delete": "Delete Status",
-      "edit": "Edit Status"
-    },
-    "chart": {
-      "dossier-states": "Dossier States"
-    },
-    "error": {
-      "conflict": "Dossier State with this name already exists!",
-      "generic": "Failed to add Dossier State"
-    },
-    "search": "Search...",
-    "table-col-names": {
-      "name": "Name",
-      "dossiers-count": "Dossiers Count"
-    },
-    "add-new": "New Status",
-    "table-header": {
-      "title": "{length} dossier {length, plural, one{state} other{states}}"
-    },
-    "no-data": {
-      "action": "New State",
-      "title": "There are no dossier states."
-    },
-    "no-match": {
-      "title": "No dossier states match your current filters."
-    }
-  },
   "dossier-attribute-types": {
     "date": "Date",
     "image": "Image",
@@ -747,11 +716,11 @@
       "total-people": "Total users"
     },
     "table-col-names": {
+      "documents-status": "Documents Status",
+      "dossier-status": "Dossier Status",
       "name": "Name",
       "needs-work": "Workload",
-      "owner": "Owner",
-      "documents-status": "Documents Status",
-      "dossier-status": "Dossier Status"
+      "owner": "Owner"
     },
     "table-header": {
       "title": "{length} active {length, plural, one{Dossier} other{Dossiers}}"
@@ -855,6 +824,35 @@
     "under-review": "Under Review",
     "upload-files": "Drag & drop files anywhere..."
   },
+  "dossier-states": "Dossier States",
+  "dossier-states-listing": {
+    "action": {
+      "delete": "Delete Status",
+      "edit": "Edit Status"
+    },
+    "add-new": "New Status",
+    "chart": {
+      "dossier-states": "Dossier States"
+    },
+    "error": {
+      "conflict": "Dossier State with this name already exists!",
+      "generic": "Failed to add Dossier State"
+    },
+    "no-data": {
+      "title": "There are no dossier states."
+    },
+    "no-match": {
+      "title": "No dossier states match your current filters."
+    },
+    "search": "Search...",
+    "table-col-names": {
+      "dossiers-count": "Dossiers Count",
+      "name": "Name"
+    },
+    "table-header": {
+      "title": "{length} dossier {length, plural, one{state} other{states}}"
+    }
+  },
   "dossier-template-info": "Info",
   "dossier-template-info-screen": {
     "created-by": "Created by",
@@ -1009,11 +1007,11 @@
           "label": "Description",
           "placeholder": "Enter Description"
         },
-        "due-date": "Due Date",
         "dossier-status": {
           "label": "Dossier Status",
           "placeholder": "No status assigned"
         },
+        "due-date": "Due Date",
         "name": {
           "label": "Dossier Name",
           "placeholder": "Enter Name"
@@ -1689,8 +1687,8 @@
     "no-time-left": "Time to restore already passed"
   },
   "toggle-auto-analysis-message": {
-    "success": "{toggleOperation} automatic processing.",
-    "error": "Something went wrong."
+    "error": "Something went wrong.",
+    "success": "{toggleOperation} automatic processing."
   },
   "top-bar": {
     "navigation-items": {

From 5c6330fb4f9b942340b446c319eb5da9a73ebee7 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 14 Feb 2022 13:16:19 +0200
Subject: [PATCH 16/33] added delete only functionality

---
 ...d-edit-dossier-state-dialog.component.html | 20 +++++------
 ...add-edit-dossier-state-dialog.component.ts | 25 ++++++++------
 ...delete-dossier-state-dialog.component.html |  7 ++--
 ...m-delete-dossier-state-dialog.component.ts | 32 ++++++++++++++----
 ...ssier-states-listing-screen.component.html | 19 +++++------
 ...dossier-states-listing-screen.component.ts | 33 +++++++++++--------
 .../edit-dossier-general-info.component.html  |  2 +-
 .../edit-dossier-general-info.component.ts    |  2 +-
 .../dossiers-listing-details.component.ts     |  2 +-
 .../dossiers-listing-status.component.html    |  3 +-
 .../dossiers-listing-status.component.ts      |  2 +-
 .../entity-services/dossier-state.service.ts  |  4 +--
 .../entity-services/dossiers.service.ts       | 12 +------
 apps/red-ui/src/assets/i18n/en.json           |  5 +--
 libs/red-domain/src/index.ts                  |  1 +
 .../lib/dossier-state/dossier-state.model.ts  |  2 ++
 .../src/lib/dossier-state/dossier-state.ts    |  1 +
 17 files changed, 98 insertions(+), 74 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
index 7c0c7d695..4bb4a6f4d 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -1,8 +1,8 @@
 <section class="dialog">
     <div
         [translateParams]="{
-            type: data.dossierState ? 'edit' : 'create',
-            name: data.dossierState?.name
+            type: dossierState ? 'edit' : 'create',
+            name: dossierState?.name
         }"
         [translate]="'add-edit-dossier-state.title'"
         class="dialog-header heading-l"
@@ -21,23 +21,23 @@
             </div>
 
             <div class="iqser-input-group required">
-                <label translate="add-edit-dossier-state.form.description"></label>
+                <label translate="add-edit-dossier-state.form.color"></label>
                 <input
-                    [placeholder]="'add-edit-dossier-state.form.description-placeholder' | translate"
+                    [placeholder]="'add-edit-dossier-state.form.color-placeholder' | translate"
                     class="hex-color-input"
-                    formControlName="description"
-                    name="description"
+                    formControlName="color"
+                    name="color"
                     type="text"
                 />
                 <div
-                    (colorPickerChange)="form.get('description').setValue($event)"
-                    [colorPicker]="form.get('description').value"
+                    (colorPickerChange)="form.get('color').setValue($event)"
+                    [colorPicker]="form.get('color').value"
                     [cpOutputFormat]="'hex'"
-                    [style.background]="form.get('description').value"
+                    [style.background]="form.get('color').value"
                     class="input-icon"
                 >
                     <mat-icon
-                        *ngIf="!form.get('description').value || form.get('description').value?.length === 0"
+                        *ngIf="!form.get('color').value || form.get('color').value?.length === 0"
                         svgIcon="red:color-picker"
                     ></mat-icon>
                 </div>
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 6e3193355..cbe065049 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
@@ -2,11 +2,11 @@ import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/c
 import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { IDossierState } from '@red/domain';
 
 interface DialogData {
-    dossierState: IDossierState;
-    dossierTemplateId: string;
+    readonly dossierState: IDossierState;
+    readonly dossierTemplateId: string;
 }
 
 @Component({
@@ -16,30 +16,35 @@ interface DialogData {
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
+    readonly dossierState: IDossierState;
+    readonly dossierTemplateId: string;
+
     constructor(
         private readonly _formBuilder: FormBuilder,
         protected readonly _injector: Injector,
         protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public data: DialogData,
+        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
     ) {
         super(_injector, _dialogRef);
-        this.form = this._getForm(data.dossierState);
+        this.dossierState = data.dossierState;
+        this.dossierTemplateId = data.dossierTemplateId;
+        this.form = this.#getForm();
         this.initialFormValue = this.form.getRawValue();
     }
 
     save(): void {
         const dossierState: IDossierState = {
-            dossierStatusId: this.data.dossierState?.dossierStatusId,
-            dossierTemplateId: this.data.dossierTemplateId,
+            dossierStatusId: this.dossierState?.dossierStatusId,
+            dossierTemplateId: this.dossierTemplateId,
             ...this.form.getRawValue(),
         };
         this._dialogRef.close(dossierState);
     }
 
-    private _getForm(dossierState: IDossierState): FormGroup {
+    #getForm(): FormGroup {
         return this._formBuilder.group({
-            name: [dossierState?.name, Validators.required],
-            description: [dossierState?.description, Validators.required],
+            name: [this.dossierState?.name, Validators.required],
+            color: [this.dossierState?.color, Validators.required],
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 174896a32..6aa8cacc5 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -16,7 +16,8 @@
                         [placeholder]="'confirm-delete-dossier-state.form.status-placeholder' | translate"
                         formControlName="replaceDossierStatusId"
                     >
-                        <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
+                        <mat-option>{{ 'confirm-delete-dossier-state.form.status-placeholder' | translate }}</mat-option>
+                        <mat-option *ngFor="let state of otherStates" [value]="state.dossierStatusId">
                             {{ state.name }}
                         </mat-option>
                     </mat-select>
@@ -26,8 +27,8 @@
     </div>
 
     <div class="dialog-actions">
-        <button (click)="dialogRef.close(replaceDossierStatusId)" color="primary" [disabled]="!replaceDossierStatusId" mat-flat-button>
-            {{ 'confirm-delete-dossier-state.delete-replace' | translate }}
+        <button (click)="dialogRef.close(afterCloseValue)" color="primary" mat-flat-button>
+            {{ label | translate }}
         </button>
         <div (click)="dialogRef.close()" [translate]="'confirm-delete-dossier-state.cancel'" class="all-caps-label cancel"></div>
     </div>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index 547990732..9c8117150 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -1,12 +1,12 @@
 import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { IDossierState } from '@red/domain';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { FormBuilder, FormGroup } from '@angular/forms';
 
 interface DialogData {
-    toBeDeletedState: IDossierState;
-    otherStates: IDossierState[];
-    dossierCount: number;
+    readonly toBeDeletedState: IDossierState;
+    readonly otherStates: IDossierState[];
+    readonly dossierCount: number;
 }
 
 @Component({
@@ -17,19 +17,25 @@ interface DialogData {
 })
 export class ConfirmDeleteDossierStateDialogComponent {
     readonly form: FormGroup;
+    readonly toBeDeletedState: IDossierState;
+    readonly otherStates: IDossierState[];
+    readonly dossierCount: number;
 
     constructor(
         private readonly _formBuilder: FormBuilder,
         readonly dialogRef: MatDialogRef<ConfirmDeleteDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public data: DialogData,
+        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
     ) {
         this.form = this._getForm();
+        this.toBeDeletedState = data.toBeDeletedState;
+        this.otherStates = data.otherStates;
+        this.dossierCount = data.dossierCount;
     }
 
     get translateArgs() {
         return {
-            name: this.data.toBeDeletedState.name,
-            count: this.data.dossierCount,
+            name: this.toBeDeletedState.name,
+            count: this.dossierCount,
         };
     }
 
@@ -37,6 +43,18 @@ export class ConfirmDeleteDossierStateDialogComponent {
         return this.form.get('replaceDossierStatusId').value;
     }
 
+    get label(): string {
+        return this.replaceDossierStatusId ? 'confirm-delete-dossier-state.delete-replace' : 'confirm-delete-dossier-state.delete';
+    }
+
+    get afterCloseValue(): string | true {
+        if (this.replaceDossierStatusId) {
+            return this.replaceDossierStatusId;
+        }
+
+        return true;
+    }
+
     private _getForm(): FormGroup {
         return this._formBuilder.group({
             replaceDossierStatusId: [null],
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index eff14a34f..9ce7e905f 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -34,15 +34,14 @@
             </div>
 
             <div class="right-container">
-                <ng-container *ngIf="chartData">
-                    <redaction-simple-doughnut-chart
-                        [config]="chartData"
-                        [radius]="80"
-                        [strokeWidth]="15"
-                        [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
-                        [totalType]="'simpleLabel'"
-                    ></redaction-simple-doughnut-chart>
-                </ng-container>
+                <redaction-simple-doughnut-chart
+                    *ngIf="chartData"
+                    [config]="chartData"
+                    [radius]="80"
+                    [strokeWidth]="15"
+                    [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
+                    [totalType]="'simpleLabel'"
+                ></redaction-simple-doughnut-chart>
             </div>
         </div>
     </section>
@@ -68,7 +67,7 @@
         <div *ngIf="cast(entity) as state">
             <div class="cell">
                 <div class="flex-align-items-center">
-                    <div [style.background-color]="state.description" class="dossier-state-square"></div>
+                    <div [style.background-color]="state.color" class="dossier-state-square"></div>
                     <div class="state-name">{{ state.name }}</div>
                 </div>
             </div>
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 3b532f3e0..fffd64809 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
@@ -8,7 +8,7 @@ import {
     TableColumnConfig,
     Toaster,
 } from '../../../../../../../../libs/common-ui/src';
-import { DossierState, IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state';
+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';
@@ -55,7 +55,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
     }
 
     async ngOnInit(): Promise<void> {
-        await this._loadData();
+        await this.#loadData();
     }
 
     openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) {
@@ -64,7 +64,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId,
         };
         this._dialogService.openDialog('addEditDossierState', $event, data, async (newValue: IDossierState) => {
-            await this._createNewDossierStateAndRefreshView(newValue);
+            await this.#createNewDossierStateAndRefreshView(newValue);
         });
     }
 
@@ -75,17 +75,22 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             otherStates: this.entitiesService.all.filter(state => state.dossierStatusId !== dossierState.dossierStatusId),
             dossierCount: dossierState.dossierCount,
         };
-        this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string) => {
+        this._dialogService.openDialog('deleteDossierState', $event, data, async (value: string | true) => {
             if (value) {
-                await firstValueFrom(this.dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
+                if (typeof value === 'string') {
+                    await firstValueFrom(this.dossierStateService.deleteAndReplace(dossierState.dossierStatusId, value));
+                } else {
+                    await firstValueFrom(this.dossierStateService.delete(dossierState.dossierStatusId));
+                }
             }
 
             await this._appStateService.refreshDossierTemplate(templateId);
-            await this._loadData();
+            await this.#loadData();
         });
     }
 
-    private async _createNewDossierStateAndRefreshView(newValue: IDossierState): Promise<void> {
+    async #createNewDossierStateAndRefreshView(newValue: IDossierState): Promise<void> {
+        this._loadingService.start();
         await firstValueFrom(this.dossierStateService.setDossierState(newValue)).catch(error => {
             if (error.status === HttpStatusCode.Conflict) {
                 this._toaster.error(_('dossier-states-listing.error.conflict'));
@@ -94,33 +99,33 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
             }
         });
         await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
-        await this._loadData();
+        await this.#loadData();
     }
 
-    private async _loadData(): Promise<void> {
+    async #loadData(): Promise<void> {
         this._loadingService.start();
         await firstValueFrom(this._dossiersService.loadAll());
 
         try {
             const templateId = this._dossierTemplatesService.activeDossierTemplateId;
             const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
-            this._setStatesCount();
-            this.chartData = this._loadChartData();
+            this.#setStatesCount();
+            this.chartData = this.#loadChartData();
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
         this._loadingService.stop();
     }
 
-    private _loadChartData(): DoughnutChartConfig[] {
+    #loadChartData(): DoughnutChartConfig[] {
         const config: DoughnutChartConfig[] = [];
         this.dossierStateService.all.forEach(state => {
-            config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.description });
+            config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.color });
         });
 
         return config;
     }
 
-    private _setStatesCount(): void {
+    #setStatesCount(): void {
         this.dossierStateService.all.forEach(
             state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId)),
         );
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 7faada51b..31f08d1aa 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
@@ -65,7 +65,7 @@
                 >
                     <mat-option *ngFor="let state of states" [value]="state.dossierStatusId">
                         <div class="flex-align-items-center">
-                            <redaction-small-chip [color]="state.description"></redaction-small-chip>
+                            <redaction-small-chip [color]="state.color"></redaction-small-chip>
                             <div>{{ state.name }}</div>
                         </div>
                     </mat-option>
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 16b5cc998..71531baa3 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
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import * as moment from 'moment';
-import { Dossier, IDossierRequest, IDossierTemplate } from '@red/domain';
+import { Dossier, DossierState, IDossierRequest, IDossierTemplate } from '@red/domain';
 import { EditDossierSaveResult, EditDossierSectionInterface } from '../edit-dossier-section.interface';
 import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
 import { PermissionsService } from '@services/permissions.service';
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 d27fd37e3..d574ff242 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
@@ -43,7 +43,7 @@ export class DossiersListingDetailsComponent {
         const config: DoughnutChartConfig[] = [];
         this._dossierStateService.all.forEach(state => {
             state.dossierCount = this.dossiersService.getCountWithState(state.dossierStatusId);
-            config.push({ value: state.dossierCount, label: state.name, color: state.description });
+            config.push({ value: state.dossierCount, label: state.name, color: state.color });
         });
         const notAssignedLength = this.dossiersService.all.length - config.map(v => v.value).reduce((acc, val) => acc + val, 0);
         config.push({
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
index 3624dd196..626b6ecbd 100644
--- 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
@@ -1,9 +1,10 @@
 <ng-container *ngIf="dossier.dossierStatusId">
     <div class="flex-align-items-center dossier-status-container">
         <div class="dossier-status-text">{{ currentState.name }}</div>
-        <redaction-small-chip [color]="currentState.description"></redaction-small-chip>
+        <redaction-small-chip [color]="currentState.color"></redaction-small-chip>
     </div>
 </ng-container>
+
 <ng-container *ngIf="!dossier.dossierStatusId">
     <div class="flex-align-items-center dossier-status-container">
         <div class="dossier-status-text">No status assigned</div>
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 96710947d..61f1e16da 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
 import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
-import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { DossierState } from '@red/domain';
 
 @Component({
     selector: 'redaction-dossiers-listing-status',
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 44a82f9ee..a3c2edc54 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
@@ -1,6 +1,6 @@
 import { Injectable, Injector } from '@angular/core';
-import { EntitiesService, mapEach, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
-import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
+import { EntitiesService, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
+import { DossierState, IDossierState } from '@red/domain';
 import { forkJoin, Observable, switchMap } from 'rxjs';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { map, tap } from 'rxjs/operators';
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 234707713..4787fdb30 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
@@ -62,17 +62,7 @@ export class DossiersService extends EntitiesService<Dossier, IDossier> {
     }
 
     loadAllIfChanged(): Observable<ChangesDetails> {
-        return this.hasChangesDetails$().pipe(
-            catchError(err => {
-                console.log('aaa', err);
-                return of(err);
-            }),
-            switchMap(changes => this.loadAll().pipe(mapTo(changes))),
-            catchError(err => {
-                console.log('bbb', err);
-                return of(err);
-            }),
-        );
+        return this.hasChangesDetails$().pipe(switchMap(changes => this.loadAll().pipe(mapTo(changes))));
     }
 
     hasChangesDetails$(): Observable<ChangesDetails> {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index bcc13bfb7..8b5820cf6 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -73,8 +73,8 @@
   },
   "add-edit-dossier-state": {
     "form": {
-      "description": "Hex Color",
-      "description-placeholder": "#",
+      "color": "Hex Color",
+      "color-placeholder": "#",
       "name": "Status Name",
       "name-placeholder": "Enter Name"
     },
@@ -411,6 +411,7 @@
   "confirm-delete-dossier-state": {
     "cancel": "Cancel",
     "delete-replace": "Delete and Replace",
+    "delete": "Delete only",
     "form": {
       "status": "Replace Status",
       "status-placeholder": "Choose another status"
diff --git a/libs/red-domain/src/index.ts b/libs/red-domain/src/index.ts
index aee8ff159..e2d4bf0e4 100644
--- a/libs/red-domain/src/index.ts
+++ b/libs/red-domain/src/index.ts
@@ -19,3 +19,4 @@ export * from './lib/configuration';
 export * from './lib/signature';
 export * from './lib/legal-basis';
 export * from './lib/dossier-stats';
+export * from './lib/dossier-state';
diff --git a/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
index 070171643..242a34ace 100644
--- a/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
@@ -6,6 +6,7 @@ export class DossierState implements IDossierState, IListable {
     readonly dossierStatusId: string;
     readonly dossierTemplateId: string;
     readonly name: string;
+    readonly color: string;
     dossierCount?: number;
 
     constructor(dossierState: IDossierState) {
@@ -13,6 +14,7 @@ export class DossierState implements IDossierState, IListable {
         this.dossierStatusId = dossierState.dossierStatusId;
         this.dossierTemplateId = dossierState.dossierTemplateId;
         this.name = dossierState.name;
+        this.color = dossierState.color;
         this.dossierCount = dossierState.dossierCount;
     }
 
diff --git a/libs/red-domain/src/lib/dossier-state/dossier-state.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
index 7ebd532e8..f7491e23b 100644
--- a/libs/red-domain/src/lib/dossier-state/dossier-state.ts
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
@@ -3,5 +3,6 @@ export interface IDossierState {
     dossierStatusId: string;
     dossierTemplateId: string;
     name: string;
+    color: string;
     dossierCount?: number;
 }

From 648faad8333c876c82f6fe464a13f03f8aeefa87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Mon, 14 Feb 2022 13:34:42 +0200
Subject: [PATCH 17/33] RED-3237: Edit dossier dictionary display name
 permissions

---
 .../dictionary/edit-dossier-dictionary.component.html         | 4 ++--
 .../dictionary/edit-dossier-dictionary.component.ts           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
index 6aec3866c..fe48130cc 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
@@ -10,7 +10,7 @@
             </div>
         </div>
 
-        <form [formGroup]="form" *ngIf="form">
+        <form *ngIf="form" [formGroup]="form">
             <div class="iqser-input-group">
                 <mat-checkbox color="primary" formControlName="addToDictionaryAction" name="addToDictionaryAction">
                     {{ 'add-edit-dictionary.form.add-to-dictionary-action' | translate }}
@@ -19,7 +19,7 @@
         </form>
     </div>
 
-    <div *ngIf="canEdit" class="display-name">
+    <div *ngIf="canEditDisplayName" class="display-name">
         <div translate="edit-dossier-dialog.dictionary.display-name.edit"></div>
         <iqser-editable-input
             (save)="updateDisplayName($event)"
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 1adf41aa0..5decb01fc 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
@@ -20,10 +20,10 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
 
     form: FormGroup;
     canEdit = false;
+    canEditDisplayName = false;
     dossierDictionary: IDictionary;
 
     readonly circleButtonTypes = CircleButtonTypes;
-
     @ViewChild(DictionaryManagerComponent, { static: false }) private readonly _dictionaryManager: DictionaryManagerComponent;
 
     constructor(
@@ -58,6 +58,7 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa
     async ngOnInit() {
         this._loadingService.start();
         this.canEdit = this._permissionsService.canEditDossier(this.dossier);
+        this.canEditDisplayName = this._permissionsService.isOwner(this.dossier);
         await this._updateDossierDictionary();
         this.form = this._getForm();
         this._loadingService.stop();

From 1815d2cf4db40e900f132188be3cd37a0cf71be3 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Mon, 14 Feb 2022 12:39:14 +0100
Subject: [PATCH 18/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3213 -> 3213 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2ee2fb9c6..fba0e1e3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.230.0",
+  "version": "3.231.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 2e5786990a095a3ce01506304f507f0006e2d694..17f0e4109a1d8e24337445557dc14cb195c4b579 100644
GIT binary patch
delta 3169
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
H08jt`Mu;i3

delta 3196
zcmV-?41@EH8I2h-ABzY80000000ZqC+j8T!HP8ME)R}hdRFrv@WO=gPWSX=uolcXq
zed!BGf+A{)<dTsxGJkyZLo^%OGO+olGx+S<M~?5>uJ5@^&;7`D>;Sq@@Pkk@Xid#<
zh0u?&)X%Zab^Xg9HG9fP{e4-(>H3FH|E&KXqwUpyMPeK=IW~{#`oq@X3SRhA`u7~i
z^E&-|?jivFF9PU7_V>%Gx&6ZR|2j%>RTG9T|N70B*6Q-^;(s;WmPN%-Q)O3|DPv{5
zzPU+?oYnJ9QEW1TOIpvPVtWGy;r=ecTbez6`sb45zx^8L^_nuA%^o%>du`7=+rG1B
zzW5u6zYFnqDgLhDuOsF-VvZx`IAV??<~V%LZ(>@P8Gib-e!%7B_1(ps(}y!FB{(J(
z`qu?Q?<|_f<bQFEoICiH5(?|DkssLQ<K4yc0AjrkNm5iqK!!NF-&94D$5vEiMYTpB
zyDQK2oiQ9r9Rb3HVb$~<S)+x|7m!^Ka#_w1^kp<BR!7Qe*-qTzYD0626(s<#w7#%l
ztk?q8Mxs&ovnIHTQbEWTKUxnoW+~vZZ57!X;f59bcYj&bl+gluDw1JF-;%?)=k2GJ
zP?E)BCAo@Y+rQ>W!=mDHL{9mL>LQ~t`Z)IDAjZ2vtHLpDYT&%3%OK|@Nlv6?y#_;w
zNLpl_;)@bTls&DHJzt)PZ1%F1ht{Img(K}kvjJyyjAF;aFL4~xd;<tvkhilu3QNfH
z7P!|x4u3&a4I`Ycs-;NS=?*<tr!%Q9R>AfzaYb@=XXHO>s+xC|1<e_$47Ol%YY_k0
z$FZ<Zi?>qV1_O#?KMn+@i`QEcQ;do{dqQ<o5t1XE$LLDgB1^vCt_3dhzScD8yR96|
zdwZbSK<@5m&QwA$Yanz2nIHy$&2UIEv4ZquYk!m%x!8x}*;Dg6*?^`pVwFvp(Fk+J
zP6$WS*7H92R|vN_bY1znnHd1*$`6Z1lccD6>d;AUYw5>!PSMdFS??7!gXy8?G|#1d
zbdFExrx)O+qA~B_pB5uq=w*Zx)@&hGAt$N$fBlRN1`^x>>x0#_@FB-EO({~**z7kN
zUw=Tld802SF7e6j-PrGHJWhGkX-ygkTPL)tnH8l}IvXK|Rz9%q4VX}l+(~eh`a26|
zlx1W#F%jHaBzjm8wKIpY)Lk7JOTC32>g*H9L-+&&vC+|=uvY87PFYcLcw-04$Ro32
z5)~D0T{`HVR9rUGR5jUncl3t1M{*g};D7v`&o<8<8IroGU3-rSa^MV`V8<EJ1f{y7
zI(MT-<b@$3yZg3=Ky1**4*iGdBlQvAQ&TnpvQXX2I1qeTpffqleNM3rW&*)6PGjIU
zy4;h8!<$dg7c|cZWlg?8pWIx`0ht97AerSDJ?Z5?5_h@06x;&z-;3%#$%=;otbaQN
zYe!BG`!~=`Q$u<44i*PV=_tG@6pnq{qxhWU4SPqbEy>@1#}$mMvMLgq4UqYh^w>)k
z8IID5Mk%8k6G_1&mc;9^eBDH8(&YCd2<z~RX)4?v{)>?0urkdNPkuTEi;z@F_Ws)_
zCD31^uSD_xC!FIAsp`Qx%Sp}otABo-uZk>#b-2tvCl#4wdNoP(%I}f=zNl*o<N_^>
z^mt)!KH!XvP~J|WTt*7Y`v%m?2nr$N48cUXRJQ1gn6jc8+NwQiEkQJ*5_0V*%_w>Q
zUrA_6s)i@U86=!TVx7r-U^_cQ{8DPXe*Yb4s^&H{#527oJlx~?Lk2YB5r2D=o56PD
z9SxuT<$wSFPmQk9_un=N-4OI;1?G`o53x<}hCp(pC;L`K>Lz1T31kw$zhw(20XR}j
zJ6|RvS|2fF7P)twJ_@dE9^Cjp0nub~jdpIWB*zn3+G&}X9vVHjC3LiE$7l+nD&yfw
z$(Q)?9FGar7H5LyjB3ze$$wit?8|j}ih4nr_~|9XfzYax<ZuP($RLA(bjP^%!3uI%
z9FAA{e)7a|0;jK1=d>&d(*(xTg*I85hL*-;g%y;MQPph2+L$OPR+tn86A2*{<wX8c
zi?6l>+N%?-5Na{(!>*4_m0LrMGEW!~I#q4$c9Pgg3%`@y@%fiwaepXGKQR*k1Nsg&
z$fTP)kBah19Cw&;?Z(xEu7KBDptp4elf{5#(Kj_{sH`aP4jGx)lVR3~^OV7;Rc%7x
z&b4RA^~4|FG|OEhNKhams)IO+gtHu?Zu?uzj_V1eGvqjqItlVc9A+d2>$~-CSJ+ku
z^MdsgEXF@9zFE1qx_?b@5~_1U2I=?464~!swL^UZhqV(Y(b#*yRn7<EFt#-U9#U9u
zjl_qBD+5=-Iff6lKWnXIG`}X`L@?u<48(!2Tz3KDa93O=AQ*dod#z4?)6nSNf|QL3
z$JaV?<-oF=x2ebz<fLlFr46~9DZh<GgCP%wFvd~njfQ-q_<zJuFipn7C|NPIG%8mN
zt&F<d@G3ztX4^?(55ZuJa~4D-xYbsBf;_8u5P(S%uDsAN=o%F*2isi`fJ&Uz?F?yC
zc$MsE)zr=!8X`m!1+ho8MN^WM+ae~rT`1_6PML4+n#Lr=lP88d%|h)2=_yR@#@^!U
zYLCTSYZF>~xPR6WN#DUzn)3n3m%gch1fCm-Uw?!`4Z<1xd>&9c&x%c9I3t3v-R360
zYA<E5Jj_#p*J}uZ;XMUM+fkw&**nt39)Pi!pjDUK+RXGZ*is0Gd$E~hJXWN7-LZ4`
zyTD<Z`y*dp93<h0TZ@A@W*@Z93+^b66Kt=NCBHiGx_?YD$8W9CcGS|2g<NJda}MJ)
z0@t74Yngou=CmY_(tSrs2@i6oWN1?B2MF1J3*k9l?2`#3P(stU1TvN(UmuJ}KkJfp
zhL#KS`%@#5SNuq;!_dhvBZ-=cO#wC8KJc!JIRbn?BEPTOSP`N5CVMK={%S$kKp<D*
z;}Vf7+kaO>Al2;r9rB`glwt8`)hUjPhwhk7b;I08xO&~zSzVye%Gd91aOS&$U{I!N
zwAei(6Trj5XRk>cEnph;<k9vXke8f=PNP+&l|yWwDxtO@MuaOyBUuuTFNlT}!G%0v
z7be0>$r5jf{Hj$kGT3%SA3%Pr6Z{GpQKhZ{nSZUsr;9n{DH~$FrQ|`ps!%7k$E44r
zIdr=j*P`8ID0BFM+{m0f^R-#mJrImU(r&|<_EX&Wn00Kh#j)89?en&sDC|QV03<~P
zgf&odR}rqskh-G}4tBfMbdaENxVwkZ`BW@=pZ%V28?M&;ybc1cU|FcV_{CVC#Lf6&
zS%1UVfp3hKV{N)-ZMp+(3eynQE50obWGlU>q_b7>pI*rmmxq!Wd9EjU+WqQT+jU6}
zcOAf}ek?e&FPWyf(q{Wp0$VX5{y+`1!)xL8iGdowWQd4x7F|IJk1XUsxVTmsK&dB*
zZ@=|~w?8G(?GLV*)EgZ&=o?|u{~FIaMt>?@>GDNoM_s8AS1PoXlC;)r^hG8@lIp)o
z-MP5E&zp<GTf>u+NxK+s#pe!3`vFYGPlFYAIa`-97$MdmgDZK@R3sLAD#`UYi|mgk
z#idvg{u7v-zI;?Cbv}0A0d41wl>7h+GQQWiP{6R-(+A(4K`Jmqi+~?JIR5o$F@Mlp
zsR`fUNX^Er9{2Kxbu=1~CqhilZD1$@aBL7Oan>Pi@|v(+BrUR8`(=1RtVJ*7hWcmm
zgh8R_gqI5{7p4ab>i7@-PGK)GA{ZYaXEJp=fVmHXhw#7T4T6gMh^GhY^vM?o`lRC?
z8Vq2Ld|xmi=f%$ohWK8RLF?M>9)A%G_}u$;;1ogj1^P*X?EP_B6%mQS`b3E~uNf&1
zyt<u8@f=f%GM1e#{{9@|O+)JbjhwMU>Sw${EFJ|%asOqDID-uHM-uF6S^2!OccTe?
z<oi$-owA5&Lo`}5Sd6e9^ZwUmB0idT=AL^~$$a}(dyOvnYi-0|YhTV#4Sye2O)4t<
z?oWIyD%eY%84_RS@J)8PeV5yHd3~4Hb@_dl-*p9jSI~7W`mTlSD!b2$j9u1oqHAeC
z@-TK{>S<@NlSn@J=yfFhVdy*Yx%=~2c|(ldGuwk00}Z31`yoc}Sd6}>VpL4$g#rJ0
zY<Z)k@3f*pVjSm=`+|=EF+oSLZt&>xcM?HTM9tKt_fP%5ww&9!o!hyc+qs?Fxt-g&
io!hyc+qs?Fxt-g&o!hyc+qwN>+y4P5<RCEsPyhfa-a8Zk


From b1e42ca45b0111486b29a43f42080bdf6d8c0646 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 14 Feb 2022 13:55:39 +0200
Subject: [PATCH 19/33] fixed rebase stuff and chart pluralization

---
 .../app/modules/admin/admin-routing.module.ts |  2 +-
 ...ssier-states-listing-screen.component.html |  2 +-
 ...dossier-states-listing-screen.component.ts | 20 ++++++++++---------
 .../admin/services/admin-dialog.service.ts    |  1 -
 .../edit-dossier-general-info.component.ts    |  1 -
 apps/red-ui/src/assets/i18n/en.json           |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

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 6ce27d21f..bb0a2a0e8 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
@@ -120,7 +120,7 @@ const routes: Routes = [
                         component: DossierStatesListingScreenComponent,
                         canActivate: [CompositeRouteGuard],
                         data: {
-                            routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard],
+                            routeGuards: [AuthGuard, RedRoleGuard],
                         },
                     },
                     {
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
index 9ce7e905f..624230e58 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html
@@ -39,7 +39,7 @@
                     [config]="chartData"
                     [radius]="80"
                     [strokeWidth]="15"
-                    [subtitle]="'dossier-states-listing.chart.dossier-states' | translate"
+                    [subtitle]="'dossier-states-listing.chart.dossier-states' | translate: { count: chartData.length }"
                     [totalType]="'simpleLabel'"
                 ></redaction-simple-doughnut-chart>
             </div>
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 fffd64809..d4d8e2d43 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
@@ -13,12 +13,12 @@ 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 { firstValueFrom } from 'rxjs';
-import { DossierTemplatesService } from '../../../../services/entity-services/dossier-templates.service';
 import { AdminDialogService } from '../../services/admin-dialog.service';
 import { UserService } from '../../../../services/user.service';
-import { AppStateService } from '../../../../state/app-state.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';
 
 @Component({
     templateUrl: './dossier-states-listing-screen.component.html',
@@ -32,6 +32,7 @@ import { DoughnutChartConfig } from '../../../shared/components/simple-doughnut-
 export class DossierStatesListingScreenComponent extends ListingComponent<DossierState> 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<DossierState>[] = [
@@ -45,13 +46,14 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         private readonly _loadingService: LoadingService,
         private readonly _dossiersService: DossiersService,
         readonly dossierStateService: DossierStateService,
-        private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dialogService: AdminDialogService,
         private readonly _userService: UserService,
-        private readonly _appStateService: AppStateService,
         private readonly _toaster: Toaster,
+        private readonly _route: ActivatedRoute,
+        private readonly _dossierTemplatesService: DossierTemplatesService,
     ) {
         super(_injector);
+        this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId');
     }
 
     async ngOnInit(): Promise<void> {
@@ -61,7 +63,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
     openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) {
         const data = {
             dossierState,
-            dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId,
+            dossierTemplateId: this.#dossierTemplateId,
         };
         this._dialogService.openDialog('addEditDossierState', $event, data, async (newValue: IDossierState) => {
             await this.#createNewDossierStateAndRefreshView(newValue);
@@ -69,7 +71,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
     }
 
     openConfirmDeleteStateDialog($event: MouseEvent, dossierState: IDossierState) {
-        const templateId = this._dossierTemplatesService.activeDossierTemplateId;
+        const templateId = this.#dossierTemplateId;
         const data = {
             toBeDeletedState: dossierState,
             otherStates: this.entitiesService.all.filter(state => state.dossierStatusId !== dossierState.dossierStatusId),
@@ -84,7 +86,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
                 }
             }
 
-            await this._appStateService.refreshDossierTemplate(templateId);
+            await this._dossierTemplatesService.refreshDossierTemplate(templateId);
             await this.#loadData();
         });
     }
@@ -98,7 +100,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
                 this._toaster.error(_('dossier-states-listing.error.generic'));
             }
         });
-        await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId);
+        await this._dossierTemplatesService.refreshDossierTemplate(this.#dossierTemplateId);
         await this.#loadData();
     }
 
@@ -107,7 +109,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         await firstValueFrom(this._dossiersService.loadAll());
 
         try {
-            const templateId = this._dossierTemplatesService.activeDossierTemplateId;
+            const templateId = this.#dossierTemplateId;
             const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
             this.#setStatesCount();
             this.chartData = this.#loadChartData();
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 31d5dab3c..38fd85808 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
@@ -29,7 +29,6 @@ type DialogType =
     | 'smtpAuthConfig'
     | 'addEditDossierTemplate'
     | 'addEditDossierAttribute'
-    | 'addEditJustification'
     | 'uploadDictionary'
     | 'addEditDossierState'
     | 'deleteDossierState';
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 71531baa3..bf935c777 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
@@ -15,7 +15,6 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 import { firstValueFrom } from 'rxjs';
 import { DossierStateService } from '@services/entity-services/dossier-state.service';
-import { DossierState } from '../../../../../../../../../libs/red-domain/src/lib/dossier-state';
 import { DOSSIER_TEMPLATE_ID } from '@utils/constants';
 
 @Component({
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 8b5820cf6..4faf40b67 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -833,7 +833,7 @@
     },
     "add-new": "New Status",
     "chart": {
-      "dossier-states": "Dossier States"
+      "dossier-states": "{count, plural, one{Dossier State} other{Dossier States}}"
     },
     "error": {
       "conflict": "Dossier State with this name already exists!",

From b7d290778e0baad94e768f904aec9f913d0b612f Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 14 Feb 2022 14:08:18 +0200
Subject: [PATCH 20/33] back to data

---
 .../add-edit-dossier-state-dialog.component.html  |  4 ++--
 .../add-edit-dossier-state-dialog.component.ts    | 15 +++++----------
 ...irm-delete-dossier-state-dialog.component.html |  2 +-
 ...nfirm-delete-dossier-state-dialog.component.ts | 12 +++---------
 libs/common-ui                                    |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
index 4bb4a6f4d..8eabdf913 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html
@@ -1,8 +1,8 @@
 <section class="dialog">
     <div
         [translateParams]="{
-            type: dossierState ? 'edit' : 'create',
-            name: dossierState?.name
+            type: data.dossierState ? 'edit' : 'create',
+            name: data.dossierState?.name
         }"
         [translate]="'add-edit-dossier-state.title'"
         class="dialog-header heading-l"
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 cbe065049..0a3ec2ad4 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
@@ -16,26 +16,21 @@ interface DialogData {
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
-    readonly dossierState: IDossierState;
-    readonly dossierTemplateId: string;
-
     constructor(
         private readonly _formBuilder: FormBuilder,
         protected readonly _injector: Injector,
         protected readonly _dialogRef: MatDialogRef<AddEditDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
+        @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
     ) {
         super(_injector, _dialogRef);
-        this.dossierState = data.dossierState;
-        this.dossierTemplateId = data.dossierTemplateId;
         this.form = this.#getForm();
         this.initialFormValue = this.form.getRawValue();
     }
 
     save(): void {
         const dossierState: IDossierState = {
-            dossierStatusId: this.dossierState?.dossierStatusId,
-            dossierTemplateId: this.dossierTemplateId,
+            dossierStatusId: this.data.dossierState?.dossierStatusId,
+            dossierTemplateId: this.data.dossierTemplateId,
             ...this.form.getRawValue(),
         };
         this._dialogRef.close(dossierState);
@@ -43,8 +38,8 @@ export class AddEditDossierStateDialogComponent extends BaseDialogComponent {
 
     #getForm(): FormGroup {
         return this._formBuilder.group({
-            name: [this.dossierState?.name, Validators.required],
-            color: [this.dossierState?.color, Validators.required],
+            name: [this.data.dossierState?.name, Validators.required],
+            color: [this.data.dossierState?.color, Validators.required],
         });
     }
 }
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 6aa8cacc5..8618972b1 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -17,7 +17,7 @@
                         formControlName="replaceDossierStatusId"
                     >
                         <mat-option>{{ 'confirm-delete-dossier-state.form.status-placeholder' | translate }}</mat-option>
-                        <mat-option *ngFor="let state of otherStates" [value]="state.dossierStatusId">
+                        <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
                             {{ state.name }}
                         </mat-option>
                     </mat-select>
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index 9c8117150..ec4cb8916 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -17,25 +17,19 @@ interface DialogData {
 })
 export class ConfirmDeleteDossierStateDialogComponent {
     readonly form: FormGroup;
-    readonly toBeDeletedState: IDossierState;
-    readonly otherStates: IDossierState[];
-    readonly dossierCount: number;
 
     constructor(
         private readonly _formBuilder: FormBuilder,
         readonly dialogRef: MatDialogRef<ConfirmDeleteDossierStateDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) public readonly data: DialogData,
+        @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
     ) {
         this.form = this._getForm();
-        this.toBeDeletedState = data.toBeDeletedState;
-        this.otherStates = data.otherStates;
-        this.dossierCount = data.dossierCount;
     }
 
     get translateArgs() {
         return {
-            name: this.toBeDeletedState.name,
-            count: this.dossierCount,
+            name: this.data.toBeDeletedState.name,
+            count: this.data.dossierCount,
         };
     }
 
diff --git a/libs/common-ui b/libs/common-ui
index 5a0e5accb..d4b1bb5c0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 5a0e5accb76b8e4d2d2f5de64822a716c6572f37
+Subproject commit d4b1bb5c07594dbce9d78cf56d26f75334116aaf

From 1094495e2681ee26842499af25786c72ab1406b0 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Mon, 14 Feb 2022 14:48:48 +0200
Subject: [PATCH 21/33] improvements in dossier-states-listing

---
 ...m-delete-dossier-state-dialog.component.ts | 10 ++-----
 ...dossier-states-listing-screen.component.ts | 29 +++++++------------
 .../edit-dossier-general-info.component.ts    | 12 ++++----
 .../table-item/table-item.component.ts        |  6 ++--
 4 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
index ec4cb8916..6088cb114 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts
@@ -23,7 +23,7 @@ export class ConfirmDeleteDossierStateDialogComponent {
         readonly dialogRef: MatDialogRef<ConfirmDeleteDossierStateDialogComponent>,
         @Inject(MAT_DIALOG_DATA) readonly data: DialogData,
     ) {
-        this.form = this._getForm();
+        this.form = this.#getForm();
     }
 
     get translateArgs() {
@@ -42,14 +42,10 @@ export class ConfirmDeleteDossierStateDialogComponent {
     }
 
     get afterCloseValue(): string | true {
-        if (this.replaceDossierStatusId) {
-            return this.replaceDossierStatusId;
-        }
-
-        return true;
+        return this.replaceDossierStatusId ?? true;
     }
 
-    private _getForm(): FormGroup {
+    #getForm(): FormGroup {
         return this._formBuilder.group({
             replaceDossierStatusId: [null],
         });
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 d4d8e2d43..646b0f020 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
@@ -56,8 +56,8 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         this.#dossierTemplateId = _route.snapshot.paramMap.get('dossierTemplateId');
     }
 
-    async ngOnInit(): Promise<void> {
-        await this.#loadData();
+    ngOnInit(): Promise<void> {
+        return this.#loadData();
     }
 
     openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) {
@@ -109,27 +109,18 @@ export class DossierStatesListingScreenComponent extends ListingComponent<Dossie
         await firstValueFrom(this._dossiersService.loadAll());
 
         try {
-            const templateId = this.#dossierTemplateId;
-            const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === templateId);
-            this.#setStatesCount();
-            this.chartData = this.#loadChartData();
+            const dossierStates = this.dossierStateService.all.filter(d => d.dossierTemplateId === this.#dossierTemplateId);
+            this.#setStatesCount(dossierStates);
+            this.chartData = this.dossierStateService.all.map(state => {
+                return { value: state.dossierCount, label: state.name, key: state.name, color: state.color };
+            });
+
             this.entitiesService.setEntities(dossierStates || []);
         } catch (e) {}
         this._loadingService.stop();
     }
 
-    #loadChartData(): DoughnutChartConfig[] {
-        const config: DoughnutChartConfig[] = [];
-        this.dossierStateService.all.forEach(state => {
-            config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.color });
-        });
-
-        return config;
-    }
-
-    #setStatesCount(): void {
-        this.dossierStateService.all.forEach(
-            state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId)),
-        );
+    #setStatesCount(dossierStates: DossierState[]): void {
+        dossierStates.forEach(state => (state.dossierCount = this._dossiersService.getCountWithState(state.dossierStatusId)));
     }
 }
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 bf935c777..efc7a6238 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
@@ -72,8 +72,8 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     }
 
     async ngOnInit() {
-        this._filterInvalidDossierTemplates();
-        this.form = this._getForm();
+        this.#filterInvalidDossierTemplates();
+        this.form = this.#getForm();
         if (!this.permissionsService.canEditDossier(this.dossier)) {
             this.form.disable();
         }
@@ -132,11 +132,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         this._dialogService.openDialog('confirm', null, data, async () => {
             await firstValueFrom(this._dossiersService.delete(this.dossier));
             this._editDossierDialogRef.close();
-            this._router.navigate(['main', 'dossiers']).then(() => this._notifyDossierDeleted());
+            this._router.navigate(['main', 'dossiers']).then(() => this.#notifyDossierDeleted());
         });
     }
 
-    private _getForm(): FormGroup {
+    #getForm(): FormGroup {
         return this._formBuilder.group({
             dossierName: [this.dossier.dossierName, Validators.required],
             dossierTemplateId: [
@@ -154,11 +154,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         });
     }
 
-    private _notifyDossierDeleted() {
+    #notifyDossierDeleted() {
         this._toaster.success(_('edit-dossier-dialog.delete-successful'), { params: { dossierName: this.dossier.dossierName } });
     }
 
-    private _filterInvalidDossierTemplates() {
+    #filterInvalidDossierTemplates() {
         this.dossierTemplates = this._dossierTemplatesService.all.filter(r => {
             if (this.dossier?.dossierTemplateId === r.dossierTemplateId) {
                 return true;
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 d1e991d3c..0151c3320 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
@@ -14,15 +14,15 @@ export class TableItemComponent implements OnChanges {
     @Input() dossier!: Dossier;
 
     readonly stats$: Observable<DossierStats>;
-    private readonly _ngOnChanges$ = new BehaviorSubject<string>(undefined);
+    readonly #ngOnChanges$ = new BehaviorSubject<string>(undefined);
 
     constructor(readonly dossierStatsService: DossierStatsService) {
-        this.stats$ = this._ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId)));
+        this.stats$ = this.#ngOnChanges$.pipe(switchMap(dossierId => this.dossierStatsService.watch$(dossierId)));
     }
 
     ngOnChanges() {
         if (this.dossier) {
-            this._ngOnChanges$.next(this.dossier.dossierId);
+            this.#ngOnChanges$.next(this.dossier.dossierId);
         }
     }
 }

From 308540d60896b3ec461192ac227b99cd6ee19537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20=C2=A0Schabert?= <christoph.schabert@iqser.com>
Date: Tue, 15 Feb 2022 10:22:52 +0100
Subject: [PATCH 22/33] PlanSpec.java edited online with Bitbucket

---
 bamboo-specs/src/main/java/buildjob/PlanSpec.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index 2ca8f1b37..f9fdee0a0 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -48,6 +48,7 @@ public class PlanSpec {
             .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
             .userPermissions("tbejan", PermissionType.ADMIN, PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
             .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.BUILD)
+            .groupPermissions("Documentation", PermissionType.VIEW)
             .loggedInUserPermissions(PermissionType.VIEW).anonymousUserPermissionView();
         return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
     }

From 36b1ec25572c588f45229b95a18e2b0c26c74719 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 15 Feb 2022 12:30:42 +0200
Subject: [PATCH 23/33] small improvements

---
 ...delete-dossier-state-dialog.component.html | 34 ++++++++++---------
 .../dossiers-listing-details.component.ts     |  2 +-
 .../dossiers-listing-status.component.html    |  5 ++-
 .../dossiers-listing-status.component.ts      | 15 +++++---
 .../table-item/table-item.component.html      |  4 ++-
 apps/red-ui/src/assets/i18n/en.json           |  2 +-
 6 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
index 8618972b1..332c07a5e 100644
--- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.html
@@ -6,24 +6,26 @@
     <div class="dialog-content">
         <div class="heading">{{ 'confirm-delete-dossier-state.warning' | translate: translateArgs }}</div>
 
-        <div class="replacement-suggestion">{{ 'confirm-delete-dossier-state.suggestion' | translate }}</div>
+        <ng-container *ngIf="data.dossierCount !== 0">
+            <div class="replacement-suggestion">{{ 'confirm-delete-dossier-state.suggestion' | translate }}</div>
 
-        <form [formGroup]="form">
-            <div class="flex">
-                <div class="iqser-input-group required w-300">
-                    <label translate="confirm-delete-dossier-state.form.status"></label>
-                    <mat-select
-                        [placeholder]="'confirm-delete-dossier-state.form.status-placeholder' | translate"
-                        formControlName="replaceDossierStatusId"
-                    >
-                        <mat-option>{{ 'confirm-delete-dossier-state.form.status-placeholder' | translate }}</mat-option>
-                        <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
-                            {{ state.name }}
-                        </mat-option>
-                    </mat-select>
+            <form [formGroup]="form">
+                <div class="flex">
+                    <div class="iqser-input-group w-300">
+                        <label translate="confirm-delete-dossier-state.form.status"></label>
+                        <mat-select
+                            [placeholder]="'confirm-delete-dossier-state.form.status-placeholder' | translate"
+                            formControlName="replaceDossierStatusId"
+                        >
+                            <mat-option>{{ 'confirm-delete-dossier-state.form.status-placeholder' | translate }}</mat-option>
+                            <mat-option *ngFor="let state of data.otherStates" [value]="state.dossierStatusId">
+                                {{ state.name }}
+                            </mat-option>
+                        </mat-select>
+                    </div>
                 </div>
-            </div>
-        </form>
+            </form>
+        </ng-container>
     </div>
 
     <div class="dialog-actions">
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 d574ff242..d2626983a 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
@@ -49,7 +49,7 @@ export class DossiersListingDetailsComponent {
         config.push({
             value: notAssignedLength,
             label: this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder'),
-            color: '#D8DAE0',
+            color: '#E2E4E9',
         });
         // TODO: deleted dossiers count should come with stats
         return config;
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
index 626b6ecbd..1ec18fba9 100644
--- 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
@@ -7,8 +7,7 @@
 
 <ng-container *ngIf="!dossier.dossierStatusId">
     <div class="flex-align-items-center dossier-status-container">
-        <div class="dossier-status-text">No status assigned</div>
+        <div class="dossier-status-text">{{ 'edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate }}</div>
+        <redaction-small-chip [color]="'#E2E4E9'"></redaction-small-chip>
     </div>
 </ng-container>
-
-<redaction-dossiers-listing-actions [dossier]="dossier" [stats]="stats"></redaction-dossiers-listing-actions>
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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 61f1e16da..e3994df3d 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/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,5 +1,5 @@
-import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
-import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
+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';
 
@@ -9,14 +9,21 @@ import { DossierState } from '@red/domain';
     styleUrls: ['./dossiers-listing-status.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DossiersListingStatusComponent implements OnChanges {
-    @Input() stats: DossierStats;
+export class DossiersListingStatusComponent implements OnInit, OnChanges {
     @Input() dossier: Dossier;
     currentState: DossierState;
 
     constructor(private readonly _dossierStateService: DossierStateService) {}
 
+    ngOnInit(): void {
+        this.#setState();
+    }
+
     ngOnChanges(): void {
+        this.#setState();
+    }
+
+    #setState(): void {
         if (this.dossier.dossierStatusId) {
             this.currentState = this._dossierStateService.all.find(s => s.dossierStatusId === this.dossier.dossierStatusId);
         }
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 90e29ab9a..7ad67122e 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,6 +16,8 @@
     </div>
 
     <div class="cell">
-        <redaction-dossiers-listing-status [stats]="stats" [dossier]="dossier"></redaction-dossiers-listing-status>
+        <redaction-dossiers-listing-status [dossier]="dossier"></redaction-dossiers-listing-status>
+
+        <redaction-dossiers-listing-actions [dossier]="dossier" [stats]="stats"></redaction-dossiers-listing-actions>
     </div>
 </ng-container>
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 4faf40b67..129817d95 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1010,7 +1010,7 @@
         },
         "dossier-status": {
           "label": "Dossier Status",
-          "placeholder": "No status assigned"
+          "placeholder": "Undefined"
         },
         "due-date": "Due Date",
         "name": {

From d410e9ed49b6f27bddbf3bb74863953494fbc398 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 15 Feb 2022 12:51:24 +0200
Subject: [PATCH 24/33] disabled states select if template has no states

---
 .../edit-dossier-general-info.component.html       |  9 +--------
 .../edit-dossier-general-info.component.ts         | 14 +++++++++++++-
 apps/red-ui/src/assets/i18n/en.json                |  3 ++-
 libs/common-ui                                     |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

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 31f08d1aa..4d60d4b0f 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,14 +55,7 @@
         <div class="flex fields-container">
             <div class="iqser-input-group w-300">
                 <label translate="edit-dossier-dialog.general-info.form.dossier-status.label"></label>
-                <mat-select
-                    [placeholder]="
-                        currentStatus
-                            ? currentStatus.name
-                            : ('edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate)
-                    "
-                    formControlName="dossierStatusId"
-                >
+                <mat-select [placeholder]="statusPlaceholder" [disabled]="states.length === 0" formControlName="dossierStatusId">
                     <mat-option *ngFor="let state of states" [value]="state.dossierStatusId">
                         <div class="flex-align-items-center">
                             <redaction-small-chip [color]="state.color"></redaction-small-chip>
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 efc7a6238..b37bfa6ba 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
@@ -16,6 +16,7 @@ import { DossierStatsService } from '@services/entity-services/dossier-stats.ser
 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';
 
 @Component({
     selector: 'redaction-edit-dossier-general-info',
@@ -44,6 +45,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         private readonly _router: Router,
         private readonly _editDossierDialogRef: MatDialogRef<EditDossierDialogComponent>,
         private readonly _toaster: Toaster,
+        private readonly _translateService: TranslateService,
     ) {}
 
     get changed(): boolean {
@@ -71,7 +73,17 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
         return this.hasDueDate && this.form.get('dueDate').value === null;
     }
 
-    async ngOnInit() {
+    get statusPlaceholder(): string {
+        if (this.states.length === 0) {
+            return this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.no-status-placeholder');
+        } else if (this.currentStatus) {
+            return this.currentStatus.name;
+        } else {
+            return this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder');
+        }
+    }
+
+    ngOnInit() {
         this.#filterInvalidDossierTemplates();
         this.form = this.#getForm();
         if (!this.permissionsService.canEditDossier(this.dossier)) {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 129817d95..0864eb2d2 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -418,7 +418,7 @@
     },
     "suggestion": "Would you like to replace the states of the Dossiers with another status?",
     "title": "Delete Dossier Status",
-    "warning": "The {name} status is assigned to {count} Dossiers."
+    "warning": "The {name} status is assigned to {count} {count, plural, one{Dossier} other{Dossiers}}."
   },
   "confirm-delete-file-attribute": {
     "cancel": "Keep {type, select, single{Attribute} bulk{Attributes} other{}}",
@@ -1010,6 +1010,7 @@
         },
         "dossier-status": {
           "label": "Dossier Status",
+          "no-status-placeholder": "This dossier template has no states",
           "placeholder": "Undefined"
         },
         "due-date": "Due Date",
diff --git a/libs/common-ui b/libs/common-ui
index d4b1bb5c0..f54374859 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit d4b1bb5c07594dbce9d78cf56d26f75334116aaf
+Subproject commit f54374859ec75ea73921b9e6a934bd3747f9721d

From b7fce7525d0c1e924f1a92ab867c4f70f1a2ebd8 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Tue, 15 Feb 2022 13:06:12 +0200
Subject: [PATCH 25/33] refactoired statusPlaceholder getter

---
 .../general-info/edit-dossier-general-info.component.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 b37bfa6ba..622aca251 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
@@ -76,11 +76,11 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
     get statusPlaceholder(): string {
         if (this.states.length === 0) {
             return this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.no-status-placeholder');
-        } else if (this.currentStatus) {
-            return this.currentStatus.name;
-        } else {
-            return this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder');
         }
+
+        return (
+            this.currentStatus?.name ?? this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-status.placeholder')
+        );
     }
 
     ngOnInit() {

From ca40a26fb3edd7e31a4b32907d5fead764049b78 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Tue, 15 Feb 2022 12:10:51 +0100
Subject: [PATCH 26/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3213 -> 3214 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fba0e1e3b..78f765dbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.231.0",
+  "version": "3.232.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 17f0e4109a1d8e24337445557dc14cb195c4b579..ab9e862ba418dc9569a6a5582b4c2715ec5c9565 100644
GIT binary patch
delta 3100
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

delta 3100
zcmV+%4CC{T8I2i`c7N-8OJ})!Wjl7@*soCVgHSVQP0etH(2udy&#}#Q{mUOUd&)@t
zeObfl`u9BBKkNU;XnXZvkr+ozj?JUG{;)N;f*1aj{yhiO-RnPaUC{p`fG%WzzpR?u
zFI@j`q7+v(Vd(O&Uw>h(F7Gbh&}~^%3^i4Db(u0&*6W*_q<_d+J>L|?CL_3{^*k!J
zH((I%?-IPF+0!R~E=m5|uW(+kDZ|<9VUw~q_RO>GJA3Afzk&F>5Pz5A?+X4pVvZx`
zIAV??<~U-G!{_`argfR&r%&n!TwY$^UCcRsII~iMV^X1iT_E(%qIpan*T}hpUn!xm
z{u=p#T|VAjJbw=$*6WZYMMVT;h@<;WRWx~QMMYLrYxI%3@?75;!=cm>AY2$$P2Z6<
zTKIec+4Ufo<s3m@Mss3yq^y?h#4WBiG`Cn$0`N-f3k$}IEl_PF8g)Nwf~zPMglzGn
z^+02m0xsKDk*yJKSiygnMNJtkpr;}kX7nvNjC<aGT7L;8Su9qPt2nm(YmPK5DlSLl
zl#i$`G8&_gVlNJ2yc@JC9Mh%-&Re<+a!!)uL|WEsFocMtMb;_4C~-vD(;C_H<%!5<
zFI#zNEt*|8(k?U`a8}1Cb}al7$1%+}fWQTLJIkZ6ge-4?d;Q}ORMjxT>8e_agq`lt
zb9FkC`hQ{-Z0{0RBxiR<{-dU<c~@D`oRP|43pTd~@t=Jh3+uFaE9Gr4pg8v9Kw!Ff
zvn4UbsK~P?R7VvdIl_62u9PjZ<ooSf;4<%PO@qGM%E7$12bvA!?tbP>B?PkuLMM<3
zVgT3-ha?j#NKdv#d6A2KIG#N<uagaEDkE0egnt>0Fjwq^a5QZ_?}LAhaEn9Nm9Lwb
z0dTJTuxK<%imIm$o#eKber)Fy9o>=jUQsic9(qpmT-rzH_=J9X0d6W9^A7%LF|vhT
zMmS;37Gf20l8XP=&)8rf!5y$ZSWOEba!k{dA{C9zexvaPq?<STQsNSy+}@4-uEyh(
zM}M8xq=B$?LaUltQA(w=5n^cN1MA*^3FXM01V^dAvtUM9MrIQe!L3E2hZRvfa~MnA
z)seB(Tj-(AK7l-hPaqH*9sLPwweIVb6%~g!cCd^*GAkxgQQ_95gYHSiWiw4xlZ|&r
zZ-{#&mr)JQ-}!9w?2#d<o7%Pam>>tvuzv}5oDoe>sw=8<H+n=~7$UN}Z)*s|27T<%
ze~3O(AMrgkWfLF^)xC@Z!G{Gplf&HS6x(1X5FFz)25zIvJ$X31`51jp^Ndi|<Qw$y
z&BYv$Ss($DS&q?@Uj8F-m&;4REkOUhsP2=jco@LCQ?PdA^ss*e%``QXH}7C^kbjhp
z!ka?j*tb23&q&^|ccj{q{QY-a!N@ABBB9v;nLkO7y;PCmD6MFeGP*I56ii}CydKL}
zO_U~0elLQs4!@YD!tLQd4@nLy(;V^Sr(>`PNtI;pzl~A?{Wbbh6#sw1Io^<}9;~yR
z)SSQS*ZH!@GFXSp>@!l4Nv2nmM1QaR9@+1Ux~4!b(85TM7xv}@&e#a$?Ig-&q@cWS
zK&_0R5HijXOq5Gyi$0GjE2^Qb+LP82L?bF8*N)PRlK20Wgr=lwcv74}!Z{??ncN4q
zvopjmq{i#_-+`uTZbL&n(|f|hJ)S>gKqDTpH@O*XH{Q|k>0kc$@Bh^3Dt~?dZIjRq
zL0?p09{KeU+w^V-Bu9F(Z&jpjGB%Y!CIS3gwr~=FBgM4yWiq1m5kqE?d)Mis;L7H~
zjsFu6O(xf9=hjMcJdvfHmWk=1(Q{iuN2_*>rVy$!9<G#pi677Lm{4tTCTPy61`U?H
z)x*AAr>CeFl!>2SG8_o4I)6zHSAdQTG8jmAjB6jPAcw`_c$M!bPaG$3`YLr!%aSln
zU_4!Dlci~BX-rmFK^YlU%{Hu!iGpH<Nl`G75JFK-<S(`OYD=KKI?)QD7Q;U5`q)&t
zHN+_MgaM&b)z)q&iH)@IJJ}tde;F2s!t`S^0WhHNV1rD$x$~$fpMS)0hZ)yyTs`Ot
zc)bOBTURhy3|JQZrUng_6$RcQBNKZv%o=f?G8nb0O$gk%_6)h6_~V;qxoZRo3PeP8
z5J!=4mP6ESe~a01J%MzF9LG^7LB5E?jKpAlx8Cgv+v;FmuzrHY_=m+eEB98n2~I+F
zZpa}0-dH00U8{DePk-RBcH$%&dk?tE`9K`Twno513hS+r_|R}=;3_!B@S*l+t(A=C
z*94phW_*)@IPjJ0E<haaipvB9W6y7|)#=|fG`hDSWn;qewT@glu<Yh-D)Iz5sakPq
zLoR2^ZzIuQ$b%t_aTI!^A>SxIF%(Rbu`o(j3@wey6+<hdE`K+?N)U|Mc9PgbFc{;U
z1rZ5uwbh;=&ng}SV3LF@FEk9gMn%iPb{7Po5@&TgL)sKxB|BO*wX=qX2+>4A>=A9z
zlw{?$h{<jj3i_o}=9{~wF$wYHiQ!JOP&+|-3RAnWx4636V=>p-gw`Iebwtv4u$1O}
z0P>};D<FaAMt|bhAE8i#a0Wl02h`59VpAB-h#+jYxyi5EOBpN=^HkvV8iHVWPr=c4
zlxRoxj&!jHU@RtR)#bJ}GkpxU6vE+NY$h3x6{%i#?A-k>aG2))$k!JKNjT!x;vkOM
z2d(phJBs53+pA>BuMWH}Q_S&OYqTA;v|}Nc8O@x-IDd`6_2>6mX5WH2Ey<&F-%(P+
zgWM?@n$-FMLiXQ6c#aqQWC974(DW^VjAh8z2P4wYx@4W9<-+{_)QIFYKho+jbTZ6H
zqGn=KKuxv}ysKi40N;<u@9Q>JL}<Rrp31bpS`ao6$d&lGM5N00^$<ukJAa3~=pAKP
zJX&>%<A36zJ7!beF!vFzUbl5t7bvvy^}8FK`K}-sl&KmmcF)KJ@UZaNYtlvwm_|K$
zw7m!9C1;`2XjN(D5Zk9ps4a*Q;fm2nmW1OAqG3gFArIJviSSag#2X^NYE_I3wq4N&
zkRRy;zeYw>scS%HEAi=K4tdIkSZ^tL5U(oKiGS@e>GNm~-EPLUXg3+k9DX1-GAGY`
zZPs-U1S65O+i<4+6gNI*9UE+MY<5HYylp26`w#~JNl^h|4V2tfgljUS?&yPq-EK7<
zBxoG&?qPI36^q_yzbD*=t2IBbgMceo7Ah}(G1ez>Gk#ds@O9uDqvcqeu34MzK%2re
zgn#vlZ;J!jN-rwuY?b_{SMtQ=p=3s$>q(w=zk1eoU6R9H2QaE13l8l|rfIIU+5VKk
zR!oRLPy_AoTDW~;pvEs5A|jkcS5U$u3po%ju2lw5>Ph0;Z$07dPf2w9gKH-BMn?_$
zMws-!#<Px*N>{pkQQ1*fYQ&WaZKWiwHGdm@k%^F``ma)VE^hDh=Hl?y@Z@CDE{0q2
zxx>+Z0F&|4V8va|)};(ah&9OIO5QUSiN&5uay`x>`=d#5DOQC41SY31AJs{nkKK1b
z+qokpKY)Ua?=>zIFs%0U!MA6S3e3<V;71RRe?3|ZG*@cEH#kzWajVC@{9zr927ly<
z5R-Eo7>WQK8^lVSbx51MCTtf;i)_|@8D0=;(M!3Z{#iU>Q0O_~<$}tE>A`|J{)4|$
z*h`EE#s|omOx+G(?t|bV{4aTfpyEE_>47?Z^2LEZ>9~gm1DGS<7YxXG@w0*<zL#Xs
zx^}xq1Oq<zz8yG4kbQxEk|2A3Tz^(YL}IW$QKHRjM#=-PZYNSa$CRRsWv7e3KZp3H
zA$9*o&R8M!GhQPWkAkDP|FT7#L5BGw33j!td|uhR(S$zoeJG1gS;Vv<8m$>DMp%z|
z|LZalAI&>+&%LQ+zJ05`Mwk4xHsY_fFK4KR5342>6@K?8J{A@1rOphAFMo6RCcE6e
z%k8?nzRT;n{JzWYx`Mtd=(-kt*Ftuc-DgF{F6%hawX`337&|fbv@_UABp-bAI+Fe{
z^qu(J{dugsA;#{R?LmxzhEdV|5Tkc2M&DC0DyH+ofd4$UyiwA3TG1dej&sL-!AF3Y
qBUm?hboo1pASt3|>eBnC{sdoJ&h3+73?B@BvF-n)lZL?nPyhfy?f^~z


From 78518c3fd70df40e9a16db9bf86b0e03b89379cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 15 Feb 2022 15:33:10 +0200
Subject: [PATCH 27/33] RED-3072: File bulk exclude from redaction

---
 ...dossier-overview-bulk-actions.component.ts | 113 ++++++++++--------
 .../services/bulk-actions.service.ts          |  12 ++
 .../file-actions/file-actions.component.ts    |   2 +-
 .../src/app/services/permissions.service.ts   |  10 +-
 .../src/app/services/reanalysis.service.ts    |   4 +-
 5 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts
index 90d3354dd..72d1e1ae3 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts
@@ -19,24 +19,26 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
     @Input() @Required() selectedFiles: File[];
     @Input() buttonType: CircleButtonType = CircleButtonTypes.dark;
     @Input() maxWidth: number;
-
-    analysisForced: boolean;
-    canAssignToSelf: boolean;
-    canAssign: boolean;
-    canDelete: boolean;
-    canReanalyse: boolean;
-    canDisableAutoAnalysis: boolean;
-    canEnableAutoAnalysis: boolean;
-    canOcr: boolean;
-    canSetToUnderReview: boolean;
-    canSetToUnderApproval: boolean;
-    isReadyForApproval: boolean;
-    canApprove: boolean;
-    canUndoApproval: boolean;
-    assignTooltip: string;
     buttons: Action[];
 
-    private _canMoveToSameState: boolean;
+    #analysisForced: boolean;
+    #canAssignToSelf: boolean;
+    #canAssign: boolean;
+    #canDelete: boolean;
+    #canReanalyse: boolean;
+    #canDisableAutoAnalysis: boolean;
+    #canEnableAutoAnalysis: boolean;
+    #canOcr: boolean;
+    #canSetToUnderReview: boolean;
+    #canSetToUnderApproval: boolean;
+    #isReadyForApproval: boolean;
+    #canApprove: boolean;
+    #canUndoApproval: boolean;
+    #canToggleAnalysis: boolean;
+    #assignTooltip: string;
+    #toggleAnalysisTooltip: string;
+    #allFilesAreExcluded: boolean;
+    #canMoveToSameState: boolean;
 
     constructor(
         private readonly _permissionsService: PermissionsService,
@@ -52,35 +54,35 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
                 action: () => this._bulkActionsService.delete(this.selectedFiles),
                 tooltip: _('dossier-overview.bulk.delete'),
                 icon: 'iqser:trash',
-                show: this.canDelete,
+                show: this.#canDelete,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.assign(this.selectedFiles),
-                tooltip: this.assignTooltip,
+                tooltip: this.#assignTooltip,
                 icon: 'red:assign',
-                show: this.canAssign,
+                show: this.#canAssign,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.assignToMe(this.selectedFiles),
                 tooltip: _('dossier-overview.assign-me'),
                 icon: 'red:assign-me',
-                show: this.canAssignToSelf,
+                show: this.#canAssignToSelf,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:ready-for-approval',
-                show: this.canSetToUnderApproval,
+                show: this.#canSetToUnderApproval,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.backToUnderReview(this.selectedFiles),
                 tooltip: _('dossier-overview.under-review'),
                 icon: 'red:undo',
-                show: this.canSetToUnderReview,
+                show: this.#canSetToUnderReview,
             },
             {
                 type: ActionTypes.downloadBtn,
@@ -90,45 +92,53 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.approve(this.selectedFiles),
-                disabled: !this.canApprove,
-                tooltip: this.canApprove ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'),
+                disabled: !this.#canApprove,
+                tooltip: this.#canApprove ? _('dossier-overview.approve') : _('dossier-overview.approve-disabled'),
                 icon: 'red:approved',
-                show: this.isReadyForApproval,
+                show: this.#isReadyForApproval,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.setToUnderApproval(this.selectedFiles),
                 tooltip: _('dossier-overview.under-approval'),
                 icon: 'red:undo',
-                show: this.canUndoApproval,
+                show: this.#canUndoApproval,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.ocr(this.selectedFiles),
                 tooltip: _('dossier-overview.ocr-file'),
                 icon: 'iqser:ocr',
-                show: this.canOcr,
+                show: this.#canOcr,
             },
             {
                 type: ActionTypes.circleBtn,
                 action: () => this._bulkActionsService.reanalyse(this.selectedFiles),
                 tooltip: _('dossier-overview.bulk.reanalyse'),
                 icon: 'iqser:refresh',
-                show: this.canReanalyse && (this.analysisForced || this.canEnableAutoAnalysis),
+                show: this.#canReanalyse && (this.#analysisForced || this.#canEnableAutoAnalysis),
             },
             {
                 type: ActionTypes.circleBtn,
-                action: $event => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
+                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
                 tooltip: _('dossier-overview.disable-auto-analysis'),
                 icon: 'red:stop',
-                show: this.canDisableAutoAnalysis,
+                show: this.#canDisableAutoAnalysis,
             },
             {
                 type: ActionTypes.circleBtn,
-                action: $event => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
+                action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles),
                 tooltip: _('dossier-overview.enable-auto-analysis'),
                 icon: 'red:play',
-                show: this.canEnableAutoAnalysis,
+                show: this.#canEnableAutoAnalysis,
+            },
+
+            {
+                type: ActionTypes.toggle,
+                action: () => this._bulkActionsService.toggleAnalysis(this.selectedFiles, !this.#allFilesAreExcluded),
+                tooltip: this.#toggleAnalysisTooltip,
+                checked: !this.#allFilesAreExcluded,
+                show: this.#canToggleAnalysis,
             },
         ].filter(btn => btn.show);
     }
@@ -138,7 +148,7 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
     }
 
     forceReanalysisAction($event: LongPressEvent) {
-        this.analysisForced = !$event.touchEnd && this._userPreferenceService.areDevFeaturesEnabled;
+        this.#analysisForced = !$event.touchEnd && this._userPreferenceService.areDevFeaturesEnabled;
         this._setup();
     }
 
@@ -151,37 +161,44 @@ export class DossierOverviewBulkActionsComponent implements OnChanges {
                 true,
             );
             const allFilesAreUnderApproval = this.selectedFiles.reduce((acc, file) => acc && file.isUnderApproval, true);
-            this._canMoveToSameState = allFilesAreUnderReviewOrUnassigned || allFilesAreUnderApproval;
+            this.#allFilesAreExcluded = this.selectedFiles.reduce((acc, file) => acc && file.excluded, true);
+            this.#canMoveToSameState = allFilesAreUnderReviewOrUnassigned || allFilesAreUnderApproval;
 
-            this.canAssign =
-                this._canMoveToSameState &&
+            this.#canAssign =
+                this.#canMoveToSameState &&
                 this.selectedFiles.reduce(
                     (acc, file) => (acc && this._permissionsService.canAssignUser(file)) || this._permissionsService.canUnassignUser(file),
                     true,
                 );
-            this.canAssignToSelf = this._canMoveToSameState && this._permissionsService.canAssignToSelf(this.selectedFiles);
+            this.#canAssignToSelf = this.#canMoveToSameState && this._permissionsService.canAssignToSelf(this.selectedFiles);
 
-            this.canDelete = this._permissionsService.canDeleteFile(this.selectedFiles);
+            this.#canDelete = this._permissionsService.canDeleteFile(this.selectedFiles);
 
-            this.canReanalyse = this._permissionsService.canReanalyseFile(this.selectedFiles);
+            this.#canReanalyse = this._permissionsService.canReanalyseFile(this.selectedFiles);
 
-            this.canDisableAutoAnalysis = this._permissionsService.canDisableAutoAnalysis(this.selectedFiles);
+            this.#canDisableAutoAnalysis = this._permissionsService.canDisableAutoAnalysis(this.selectedFiles);
 
-            this.canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis(this.selectedFiles);
+            this.#canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis(this.selectedFiles);
 
-            this.canOcr = this.selectedFiles.reduce((acc, file) => acc && file.canBeOCRed, true);
+            this.#canToggleAnalysis = this._permissionsService.canToggleAnalysis(this.selectedFiles);
 
-            this.canSetToUnderReview = this._permissionsService.canSetUnderReview(this.selectedFiles) && !isWorkflow;
+            this.#canOcr = this.selectedFiles.reduce((acc, file) => acc && file.canBeOCRed, true);
 
-            this.canSetToUnderApproval = this._permissionsService.canSetUnderApproval(this.selectedFiles) && !isWorkflow;
+            this.#canSetToUnderReview = this._permissionsService.canSetUnderReview(this.selectedFiles) && !isWorkflow;
 
-            this.isReadyForApproval = this._permissionsService.isReadyForApproval(this.selectedFiles) && !isWorkflow;
+            this.#canSetToUnderApproval = this._permissionsService.canSetUnderApproval(this.selectedFiles) && !isWorkflow;
 
-            this.canApprove = this._permissionsService.canBeApproved(this.selectedFiles) && !isWorkflow;
+            this.#isReadyForApproval = this._permissionsService.isReadyForApproval(this.selectedFiles) && !isWorkflow;
 
-            this.canUndoApproval = this._permissionsService.canUndoApproval(this.selectedFiles) && !isWorkflow;
+            this.#canApprove = this._permissionsService.canBeApproved(this.selectedFiles) && !isWorkflow;
 
-            this.assignTooltip = allFilesAreUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer');
+            this.#canUndoApproval = this._permissionsService.canUndoApproval(this.selectedFiles) && !isWorkflow;
+
+            this.#assignTooltip = allFilesAreUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer');
+
+            this.#toggleAnalysisTooltip = this.#allFilesAreExcluded
+                ? _('file-preview.toggle-analysis.enable')
+                : _('file-preview.toggle-analysis.disable');
 
             this.buttons = this._buttons;
         }
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 b72dbe887..d7bbdd4a5 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
@@ -91,6 +91,18 @@ export class BulkActionsService {
         this._loadingService.stop();
     }
 
+    async toggleAnalysis(files: File[], excluded: boolean) {
+        this._loadingService.start();
+        await firstValueFrom(
+            this._reanalysisService.toggleAnalysis(
+                files[0].dossierId,
+                files.map(f => f.id),
+                excluded,
+            ),
+        );
+        this._loadingService.stop();
+    }
+
     async backToUnderReview(files: File[]): Promise<void> {
         this._loadingService.start();
         await firstValueFrom(
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 e084f178c..8b4d73884 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
@@ -345,7 +345,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.fileId], !this.file.excluded));
         this._loadingService.stop();
     }
 
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index c1242d5c4..21404c135 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -23,8 +23,10 @@ export class PermissionsService {
         return ((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier));
     }
 
-    canToggleAnalysis(file: File): boolean {
-        return this.isFileAssignee(file) && (file.isNew || file.isUnderReview || file.isUnderApproval);
+    canToggleAnalysis(file: File | File[]): boolean {
+        const files = file instanceof File ? [file] : file;
+        const sameState = new Set(files.map(f => f.excluded)).size === 1;
+        return sameState && files.reduce((acc, _file) => this._canToggleAnalysis(_file) && acc, true);
     }
 
     canReanalyseFile(file: File | File[]): boolean {
@@ -152,6 +154,10 @@ export class PermissionsService {
         return (comment.user === this._userService.currentUser.id || this.isApprover(dossier)) && !file.isApproved;
     }
 
+    private _canToggleAnalysis(file: File): boolean {
+        return this.isFileAssignee(file) && (file.isNew || file.isUnderReview || file.isUnderApproval);
+    }
+
     // https://jira.iqser.com/browse/RED-2787
     private _canDeleteFile(file: File, dossier: Dossier): boolean {
         return (
diff --git a/apps/red-ui/src/app/services/reanalysis.service.ts b/apps/red-ui/src/app/services/reanalysis.service.ts
index a636a7b60..03d002626 100644
--- a/apps/red-ui/src/app/services/reanalysis.service.ts
+++ b/apps/red-ui/src/app/services/reanalysis.service.ts
@@ -49,13 +49,13 @@ export class ReanalysisService extends GenericService<unknown> {
     }
 
     @Validate()
-    toggleAnalysis(@RequiredParam() dossierId: string, @RequiredParam() fileId: string, excluded?: boolean) {
+    toggleAnalysis(@RequiredParam() dossierId: string, @RequiredParam() fileIds: string[], excluded?: boolean) {
         const queryParams: QueryParam[] = [];
         if (excluded) {
             queryParams.push({ key: 'excluded', value: excluded });
         }
 
-        return this._post({}, `toggle-analysis/${dossierId}/${fileId}`, queryParams).pipe(
+        return this._post(fileIds, `toggle-analysis/${dossierId}/bulk`, queryParams).pipe(
             switchMap(() => this._filesService.loadAll(dossierId)),
         );
     }

From 3bfa9900b9e983c5006f5ba5e410b222371604fd Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Tue, 15 Feb 2022 14:39:42 +0100
Subject: [PATCH 28/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3214 -> 3213 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 78f765dbb..ce819b06e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.232.0",
+  "version": "3.233.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index ab9e862ba418dc9569a6a5582b4c2715ec5c9565..d085bc2c15709b50c6a47b40244d9d8330229757 100644
GIT binary patch
delta 3125
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
Pzu5MFmP(&v08jt`!nO+d

delta 3126
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
Q?HAkr4^)*?@&Hf(0Q|@iX8-^I


From 0891fa2eeaf2bdd3bcf9690c5952d37baa29ba92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 15 Feb 2022 15:59:52 +0200
Subject: [PATCH 29/33] If user forces a skipped redaction pre-select the
 reason if available

---
 .../force-annotation-dialog.component.ts            | 13 +++++++++++--
 .../services/annotation-actions.service.ts          |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

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 9dbbe5eb8..5fc82072b 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
@@ -10,6 +10,7 @@ import { DossiersService } from '@services/entity-services/dossiers.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Dossier, ILegalBasisChangeRequest } from '@red/domain';
 import { firstValueFrom } from 'rxjs';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 
 export interface LegalBasisOption {
     label?: string;
@@ -37,11 +38,11 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
         private readonly _permissionsService: PermissionsService,
         protected readonly _injector: Injector,
         protected readonly _dialogRef: MatDialogRef<ForceAnnotationDialogComponent>,
-        @Inject(MAT_DIALOG_DATA) private readonly _data: { readonly dossier: Dossier; readonly hint: boolean },
+        @Inject(MAT_DIALOG_DATA)
+        private readonly _data: { readonly dossier: Dossier; readonly hint: boolean; annotations: AnnotationWrapper[] },
     ) {
         super(_injector, _dialogRef);
         this.form = this._getForm();
-        this.initialFormValue = this.form.getRawValue();
     }
 
     get isHintDialog() {
@@ -59,6 +60,14 @@ export class ForceAnnotationDialogComponent extends BaseDialogComponent implemen
         }));
 
         this.legalOptions.sort((a, b) => a.label.localeCompare(b.label));
+
+        // Set pre-existing reason if it exists
+        const existingReason = this.legalOptions.find(option => option.legalBasis === this._data.annotations[0].legalBasis);
+        if (!this._data.hint && existingReason) {
+            this.form.patchValue({ reason: existingReason }, { emitEvent: false });
+        }
+
+        this.initialFormValue = this.form.getRawValue();
     }
 
     save() {
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 05e5a6e32..9f0682b63 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
@@ -77,7 +77,7 @@ export class AnnotationActionsService {
         hint: boolean = false,
     ) {
         const { dossierId, fileId } = this._screenStateService;
-        const data = { dossier: this._dossier, hint };
+        const data = { dossier: this._dossier, annotations, hint };
         this._dialogService.openDialog('forceAnnotation', $event, data, (request: ILegalBasisChangeRequest) => {
             annotations.forEach(annotation => {
                 this._processObsAndEmit(

From 1dab07b1f1ab1c132fc79a1b11cfe8e776ecc7da Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Tue, 15 Feb 2022 16:38:15 +0100
Subject: [PATCH 30/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3213 -> 3215 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce819b06e..d86e50843 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.233.0",
+  "version": "3.234.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index d085bc2c15709b50c6a47b40244d9d8330229757..aef259ff84a5b460edd708ce47d15eb9c20c3f35 100644
GIT binary patch
delta 3127
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
R?c9E`?f(gj;9>w!001+19Ebn_

delta 3125
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
Pzu5MFmP(&v08jt`&g%;K


From 3e8ceaf4719890ef8164192964598c6a49805de3 Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Tue, 15 Feb 2022 19:15:45 +0100
Subject: [PATCH 31/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3215 -> 3214 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d86e50843..2d91d1a7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.234.0",
+  "version": "3.235.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index aef259ff84a5b460edd708ce47d15eb9c20c3f35..fe987a5eb68fbe193a1a659b453f0f25ce595b28 100644
GIT binary patch
delta 3126
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
Q_KR)*2UypPssK;`0B*_}umAu6

delta 3127
zcmV-749N428IKu|cYpM~rR%-29XqgtS19;Fs2Q}TX1GG=$5`s;*yg(a<&T;@Wu*ST
ztl@P1d!Fr__5WkEz51_6j3Xw;=22aL*cx2H3x7)go&)Oc^zVD_0`$KKyu~YIf4{7n
z+b>-IZ=w`eHDT!TuU~&*tuF5_-q3AXR17s$c6FIDR@UpAn}4LpSv}tr#U>-Tr1d;1
zwl`o9?(Y)3rP<Rbe=bS>+pln5uPMXX>|v9#H}=f4?K^wsi@$;RyAXeu;_nLnI%19^
z<~U-GBjz|_j>G5tCZ=_n;ipgP2V7oW-(Ac(eK@mHf@4yle_bH-&Z2ot9@ogZgI_73
zu>KnPfn7e{U4J|eAlB=UBt=C8WQe2tO;t2`Y(+&@RBQB+yYgJ$8N;E}5g=R`R!!fL
zHCp(50onB+m*pHmUq*9cb)>A8?ZhpvHZ-?bQ3CKv>kA9UiY-uWBpP);Yl5pN6@+Z@
zqxC>zmI5x@R*|g{Zdk#8mqkq(Eug0&8D{h?IgESWet%jCC0Q(1lB+nj{cDaiEGjNX
z<dl!7E;1UUk76$lV!Ru)Djd_M2F_c$402AA<V0H5YcPa}q(#;#z9?}-+0z=?^W}-i
zW-nWLXf2vuIMOaO8*o;~D0VFT62~#kH-Nwec{|Iau!JmcfqVVq5LDGL!s)77iiDl+
z&~tS<lYjbR6>RSkS0rb5M*gFws(Dvg(43LVU<)?42JxSL91H8Tcq`>?FrYa0<3M1#
zc(Wxj#i+=$CsaojAvwZ%jINX|vgG^iTHrG8YfXc`+seVbw+EUH<nDgvOeF-f20|y0
z31R@)42L8WD@aeaMtPBoeK?*yHLsHmXeuLC*?)u?jWAd2gm5%%J@12mjc|)Y*OjlE
znE`OF{IF;=Ns6kc4xQw-mVRvK6dm1>^<Ggkm>zmg^IY0T=lFzvdI4@K8uJeRX)&^e
zUPd@!%@$%6a*~Sw*U#8sAi*85K3Gi)A9767lp+<4&3>ct1*Drd`cmQ&pWNP!{jSF2
zlz&H^)}(>3bwaC}Sy4)*vk_uw<pb;9fC=Tuodidzzq4RQSw?0P6Tz)TqK6exJ98LI
z-PMt?)LZDG&OU)Wgijz48y)=#Yqjp{lob_+H+Ha$JTfaLQBmR6rGxHC#bq;1Rg;Z(
zM{kIGB$rVQ&focL^X!o!shirh_n06D&VR58cAODSP^v4cb2oZKUKk>>yKid<#0Gur
z(0_<NQXla>HDwbZ3)Q`h1Hp#{I+MfP=M>vuCJ-FsGzM;?%RPBGy!jY?PV<aV*5n)X
z@y*2?kXaxBl39+?lV1KKahJ<W!7V`ly{PV!tauo}x>K-r<n*wA1I;uwlsE5Saet7M
zj>4Nl;n=r5iqA;iuy>@|lKlO5T*1gHt0JM<0GU5YkG)ip;V7+Wlrp+8krYf~NxUA*
zS51^AO@1$eunxbNro!#vKMzR`E7KhD<fmh>2uYP>@4t;w0{u1mQWXDx!a3fMsvfMf
zoYb7Z>eu<Q$TC=m%j`2!kx8aklYd07{2tlwi@K&jF3`eAj~Djl1J2k8<?STOWu&0I
zZ$Pb#pb#?75KNRyWs5$KDJ!a>t=f~;5=0{^A=i%5jFR{Nm4v3GYIstdLBcsC)|uP~
zwzD(DFQmrn_uql0YHmYAJkxu^!#$oqWI!Vxu{XIHY&YJ~@abRv_wWDI=zl7G|80}d
z4MAU2U>^DP5Zm-_2qZ^(vTs$SZZbBNKqdkFTeff#fFs4U^JOxk^$|m6k$czaqu|Qs
z!HxeD5KSi6Xy?{Say*fxotBB|q0w_&LPx81jHVE(G9Ip!e2E{=@t9C;aVBWas0Iy|
zyw$_LT&Jg~7nF&gUNRgAt$#X64p)GV3^Eu<cZ_QvtRRQQ;dqtrCr=zFaQZ5BPRo)o
zO<+7-Xp^OBXlYDVSV0*XRn0c6jfsL{g-KB`kq|;rPUJ7O_-ad_y*kkfp%%kF?E2VL
zxi!Qn^MnDRQ`OdPCy9-;@H^QZpMMz^hr;w@GXXH5?_h&Wy1DbHD1V>Cafcb#Zd^U+
z3V6K*dRtd8SqxYf{iX&Dl@$fvAtMueGRzuro-!D<s!a&ox%LdXp7`UNX1Qww2?|6+
zbr469aF#>VZGVf|aXo=_h8)LHCqcf5!;HjWeYf823ft;nUa)?G#rTKCH!Js6w+T){
zb#BNY{oYt2`(3McsDDr3uy*1k8ha18%K1PX#<oVlLkjDyk@(PXW#B3}$MB){XRVct
z=GO$A2xfeffjID$>n=bX?uyF<1Y^%{uhr?_G&H)mAZ261@wJXzIk4>JZ7T8vIjLH4
zX+th&%5NjlV90|ZjByltqaoiYJ~0$bld&*LRtznT$`wN^qkk?pyh;#^*>;lHLogWQ
zoCOgHZnf2(AkQiu1YnYcD=#z*x<*CI!FCq}pb}?wJ44zOUL`wPHMO&bh6vF_LF^H2
z(UfH6wus4Y7Yh2NQ|6nyrZEZe<cZ-<vrs!hdJ0p!vA4Lo+G8=-+Jx2~u60Dxcd(S^
zd;s#LuPY#d=YK}x*B_x!gK!2vp9j>=vtm;i&WIpvx4Fr$+DjQM5A#&u^%{a;cu&F6
zc9dvG_KtM12Vg8FXw~JmHZy$;wiLqQUTh{Aj}@t2ckJB#E^wIU{>axC2T3^M*5V+J
z*$1ujf;)=i1ly}*$*&H)E>q0$TWho(wX|a)ml@5R!+$u9!1d?%T4vvZIW5Vfbl*`@
z!h_r?8Jg7k0YdiQLU@iB`(y$Ml+g4ofsAFy*9Rlg&$?utq2<E-{?v%%H9ykoFmy7^
zNTOz9Q$S6&54@{ljsV|}$nWbmRzzsN$)3uzzgiGB5XhDIxJ0DN_Vo}*H9LQYyyzWe
zSUg&Fihtwcp*v<%-7xnNu3oowRu?F=^7XqLocXRG7?i0REq2ey1n{u%*=y293z$Yd
zd9=L;<RxdJ(`Z#`<q+GaN~kS}5#fr_NS1`-3!-5~a3K%ag^BP|vcwxAziL&C47Od-
z2aq4>1iwZ`RH<t~W-IaOVh(xAhFEVYc@VEE)PITXG3oPY4&83XwP-gP${c<mH!>&B
zd~Mcs4+JBTwA*l|{S-GoW*r-Bacp)&`@C%@3i}WT07+2+VGWerRfKCYr0(d0gWYa5
z9VBQR?(Si9J{61JXTK-hhO0F{uY-UqSQaWTelgZ3aWj5c*6?-U8>8h|o32@#?m(Nu
zG=GHkif@Yp*-9@e>1>t!r&sdC<)LIop6f}TcE5Voc3qOgT?a6#9}5ocOQvbAwAucY
zz*bC%KTreh@LITiVxYz^86qN_MORS5BMUhYF0NGuQ0htI+iyML?N3Q``-5vH^+rbx
z`bL=azs9qUkxEy(d{Nm^S8BwS3T>q%t$#HeeUXWfr24N?cP?)4^XB64*6`$H(k_Nu
z@wvm%egKp4(_qD2&eo+2Mu;`Y;7Z;z6^X^3N^(8UBKxCBaVb`W{{$wdFCW!OosZpj
zK-;+^B|m_IjPErr6fmsz^uf1hkP6JuBH%|4j(<H`3^Z42!Z$clvvI4(z5HPvjeiE@
zi4c=>8yJcJ92>++oOMW>ye4cHNsDaOei>d6Ytc)&q5fGsVNmEf;pKwLh3Ub9I{t&d
zQ`k$42*wA<nM~adVD5w9A^b0SgP`I*;^~1pee%VDKIyoJ1_PKQ-xmzXdGWJ?A-<Pn
z(7JZJM+5^t_r4uCMUZ`gev%-2e}7z7MMPq-K2f60YevcguWlz&JjaxxjAf^bzdwig
zrXh9zM$T9v^)p^07LS6Xxc{<6oI!^9BMEl3tbAVCyU~O`@_i_aPFcjXAsVe2EJj$5
zdH?G&5g*MvbI-l0WWIf?y+)V(wKn3fwJ&F=h7YSI6%~H>Cq5Px?4`~OiGMG1_$IsD
zzRT^pyuQopy8OP&@4AA%E9klweb+*EmEC7W#xCnP(Y3T6c^Eq}^|UkCNhBY9^g5FM
zF!Y`H-2Hj1ydlQ!ne9Q0fre4h{Sc#fEJoi`F)F6>!hrugw!Bf&cUsXPF^+S`eZfb7
zm?Ky>cy#$Yi6AMWX6n-Wr!f9sTh8s=&h6aJ?cC1o+|KRX&h6aJ?cC1o+|KRX&h6aJ
R?c9E`?f(gj;9>w!002L)9Ekt`


From d75c3ab2cea2cba8a17fbb85ddc7387637f1a517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 15 Feb 2022 20:21:20 +0200
Subject: [PATCH 32/33] RED-3412: Fixed suggestion force hint/redaction i18n

---
 apps/red-ui/src/assets/i18n/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 0864eb2d2..df128effe 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -305,8 +305,8 @@
     "suggestion-add": "Suggested redaction",
     "suggestion-add-dictionary": "Suggested dictionary add",
     "suggestion-change-legal-basis": "Suggested change legal basis",
-    "suggestion-force-hint": "",
-    "suggestion-force-redaction": "Suggestion force hint",
+    "suggestion-force-hint": "Suggestion force hint",
+    "suggestion-force-redaction": "Suggestion force redaction",
     "suggestion-recategorize-image": "Suggested recategorize image",
     "suggestion-remove": "Suggested local removal",
     "suggestion-remove-dictionary": "Suggested dictionary removal",

From 7c2b78d31f048d2891bb58b77a83167ebfcb0c8b Mon Sep 17 00:00:00 2001
From: Atlassian Bamboo <bamboo@example.com>
Date: Tue, 15 Feb 2022 19:28:44 +0100
Subject: [PATCH 33/33] chore(release)

---
 package.json        |   2 +-
 paligo-theme.tar.gz | Bin 3214 -> 3215 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d91d1a7b..c2f6e6561 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.235.0",
+  "version": "3.236.0",
   "private": true,
   "license": "MIT",
   "scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index fe987a5eb68fbe193a1a659b453f0f25ce595b28..8b823f63ce3602f6fa0f626ca9ffbf20656da871 100644
GIT binary patch
delta 3125
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
PUu^q7S)2t*08jt`ZOHir

delta 3124
zcmV-449oM68IBo{d4Ifx^U8MYz_DMU;0K{*(3+az3ZWlksh?w;>-v{JYW9?o`unnm
z)AjFpwtv?DkJ0w(zalY?m>io&b^T#$a0M^?DgAp6sJqwyV(Eka7Xb_-`}<|p+<xKu
ze-ov+stH4vfBpIkYjt^d@rG{8qGG72va8FKv9ey@+$2TL>VNsBC^i|vC9UUCvAqF<
zaDSKJEzO=j`EyC~-+qPjdQBP5W)GW`y|HJWZQt25U;GWk--Y<Q6n|In*Aa6ZF~<>e
z95Kfca~wYBH!-ct3_pERKj8B6`tD-R>BE_o5*(8X{p$jucNWcK^0-FM9sEiOh4t6S
z5A5>s?&5g>v438NBq=H)AVVD8Z>plnV=F4MqFSSm+?D70&KM4*jsW4puxk2_tkJ^f
z3&^eqxh&@h`ZAgmt0QH#Y$tAUwV}DiiV}cVT3=W&R&0T4Bhje)Src4EsUT#FAFT%(
zvlMXIwu)?xaKj4zyDVzTXaPMH$uOgD$zj~{_R~rz$$w(8l3c~H?O$`GVNr28BBy*r
zb&=5+eH43f5aZpTRpFR6HE`b2Wsq}{Bq!3cUV|Y-BrUQ|@kNOv%AVH9o-a>CHhbC1
zLu=9O!jX2N*?_Y;MzLezmpG1Tz5xU-$lF;Sg(YNp3*74;hoGv45l&atQY7qjhn}m`
znba4nV1Ij;xFR{bGx8rbRn5D~g651=23xSXHHiQ0<5*ay#ak(Fg8{{{9|r={#hWdO
zDMm$}J)t_P2+0x7V|1l#ktN@6*8-P$Uuzol-Bu3fy*<!uAb0mOXDT6>H4r+1Ob`RW
zW;i67SV4NSHOh-z?8EWwsd=4jKvNm9$|lTcgnzkWCxoME>v<piYlK@Ix~_cP%nX2Y
z<%dP1Nm5ijb?79wwe({<r|9U8toMqV!Sv8`n&;9!I>#sU(+hA@(U^DePm7T)^fJN;
zYqk)pkdsvWzkbFB0}1Yc^}%Xd_>g0orWC1YZ1x+CFCg8#(U%gJ_~iC(>~}RDr#$Mk
zCVvfttrJ?+%!*PfosAGfD<4?*223bN?j$%${hb9f$}%#Wm<Vny5<RSl+L^;x>aLEA
zrQSjhb@mD5A$$UX*y!j_SgUnkr>v+rys?92<dIo1iHZuhE**4FDlVI8s+w%PJ9<Oh
zBe{%faQ@C`n`e&<N!`@0y~hMOaE48=<A023f>K>kox9N^^1=|2-F;g_AU5b@hyFwK
zk@|@5sVSQPS*Y%190)!v(3u?OKBw3QGlAe3r!jCFUGB-l;mybBbDC#_vL@f4k8dvK
zfXo63kj!$7p7in`iMw203T^@V??rW=WW~b()}4a2Bd3S`8)&Afp}ctqi-V+e6o1|n
z3dg?fQG7=7hP@-zmgMih;|fMrSrrM*2FUzLdhDf&3`c22qm<E&iKJi>OXBrdzG|X0
zY4Up!gmw7EG!<?S|9MDqSefRCCqEs7MM$b7d;e{e66mkdm!kOp6VCC5RP|t;<)r5P
zRlm-cMV7%jTxOq<icB)Snk0JV_kYNKU(_`Pa)A~`dc3eVA8^J-C~qfGE+YlyeFJJ`
z1ci`shG3#xDqHk<Oj%J4ZPlK%mLM8Y3AuKZW|X}DuOu`jRl}3w3=+;EvCiZ^u$`SD
zejznpzyA(2RdX8};+ftP9`5n{Ap;umh`q_pV7u{-hEM<UzkmOyMpx<kZ-1MFZV39K
z0`thPhuEffLm)ZQlYOfqb(68F1TqQW-?D|1030c%oiCFSt&bQoi`=_T9|c!74{rRQ
zfM_zgMmx7wlH-Xi?X*lx4~?GN5;|J7V>E?OmGN+;<V*Z`j>m**i!(uUMm1=#<gFg|
z<vKk@y`W6|^pfE~Xw^w_xPJn4WRSr?x?^1XU<ElW4#%r}KY8Lffzwy1b6S>!X#(Tv
zLYpj2LrY__!V1dBsA{%hZA=stD@=-liG&b}aw31J#aCMb?bV4^2(=jYVb{l|%B>+r
znI{YgovOBWJ4tM$h2P2U`25STI25KIn+bpceFqz4(#@SmMfoI-JAcf$cH`<nSHSBn
z(A&C#$zs5==r=WJsH`aP4jGx)lVR3~^OV7;Rc%7x&b4RA^~4|FG|OEhNKhams)IO+
zgtHu?Zu?uzj_V1eGvqjqItlVc9A+d2>$~-CSJ+ku^MdsgEXF@9zFE1qx=nBrs&hjI
z>G#GG+3#AlLwy2=wSN;Q(b#*yRn7<EFt#-U9#U9ujl_qBD+5=-Iff6lKWnXIG`}X`
zL@?u<48(!2Tz3KDa93O=AQ*dod#z6YrlHZj1t}X7j<0p(%7JA!Z&Q&c$Vt_TOB-@I
zQ+^wX216bUVT_~D8x8qJ@rj{env8`}vSMgyRIV6W8FjhgReyqD%(j!n9)iIb=PZaw
zaI3BM1bJ5RAOMpjTzR2k&^0Pr4z{}>0F^ka+ZocP@G9BSs;QkdG(?Cd3Sy6Fi>4$i
zw?#~LyHL<Coig9tHH}G#Cr=D_nuXd4(o>k)jlIRy)gFtv)+V&}aIGVfzJsMS=L3*0
zeO&<wJU0@*{(lIC8iX_W`8=R@o)w$Ia7F}SyUk60)n3YAd6=gHuh$R+!+Q#jwxdKl
zvUjA5Jpf}dL8~sewVCN-u%!?V_hK{2c&teEx?|_=cY(t+_eZ|II7q?~w-yI+%syzH
z7u-=CC)i#kOMZ3Wb(vz0-&&*XsHGhXxy)$h9L8w`u75wj*E0JS%xOs;rTdPO5+3AE
z$<U<M4-m5d7Q%D9*e4T6poFGx31loozCIX{e%2-H3@sPt_oqfAulbQyhoO^UMiMm>
zn*wUGec)Xca|HN)M1Ehlu_8kAP4-l#{ndi7fk3Xr$0Z_Fwy%dks@eHF<VEi&!{X7Z
zQydo$-G4Eg>V~<GaP_*av${Z`m9O93;LLXg!JtglXt8@nCV+>9&t8)@TEH~w$)oK(
zATK!!okpulD~H%VRYGk+j0jhZMzSOvUl0u|f(v=TE=+`%k|o{{`Bkf8WU%duK7jm4
zC-^loqDox@GFypH7jwu{HpF^M$%A-Rp-ya%Nq?V5bLe(6u0^}aQ0DLhxsf?}=4-RA
zdmtEzq}_%y?Wef$G3(f1i(|7J+UIRMQP_t#07!}o2y39^t|DBMA$3O|9PD<h=^#Pl
zaCZ-*^Ql<$KKni4He9Xwc^w2?!Lm?!@r$uOiJS4mvWBk%-xw{&+H}p@bO+iLrXj3X
ze1BUU$X0q$NoT9%KfRJCE)OL$@?1~ywENYww(F7{?mB=`{aA2lUouT|rOo!I1h!&A
z{DB&1hu6aG69YAV$q*6YEV_ac9$CnNaB;0NfKpEq-+t=}Z+}Xn+aFvrsW&=m&^N-Q
z|23X<j8wYP<%`OWx>6&qRA?(DX|37li+@anB-MYFx^r=RpEnnWw}vMtlXfxOiq9R6
z_5+xVp9U-La<(pIFhZ<B23PW)sYopLRFdm)7TF(7ic7H~{3kFuefg+P>U`|J1KQ3V
zDfs~uWPGo2p@3nvrw_h8gH&LK76CtcaQy4hVxYNF6TZQbnvGjM?&S~bXfz;CgnyWv
z+rUr+;MgEm;;cj3<TYWtNLpmG_RH{sSc_iD4fW6B34=n<2`?8^E=&&=)bStuox)yX
zL@+);&SdI#0COJ%58;2w8w3^i5l;`)>60%G^hw7(G#J1f`MzL4&WoQF4Dr1rgVwd%
zJt7$Jx%chBDT3?^^pgbH`{S}IB7YKt^@$Q~UNcf2cy&9G;yI=iWh^^g{QWt^Hw~%#
zH*&@bsh{y0v3L|5#r>Bp;tVp(A4#yQW##kA-i;>ok?%uUbjl*84bf=LU@^ja%==%L
ziTG&VnS1U{CG+iD?KQgOueA|>t$jH|HGEh#si^R~Kk>1sU@vuMNPL;YH-FjX_FZn*
z<@H@&*X8$Je%BTBT|w8i=(`rOtL#22GIm+ViLRyn$ivu)si&R6P9pi>qt}u2hoSGp
z=kCvA<qa`*&ukB33^a_2?uQt?V=?-kicvA07Y6+2vE_}DzSD{ZiE*4e?h8Hw#2mr8
z!K2IHNd!p|HB*<~KlT6GaxHG>c5df(Zs&Gx=XP%Ac5df(Zs&Gx=XP%Ac5df(Zs+!k
OZT|;Y*NmzFPyhf5nHnen