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] 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!",