From d7657e4d541bb96c9feb9485a5487b1e9f6d0440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 26 Jul 2022 16:53:56 +0300 Subject: [PATCH] RED-4714: fix --- .../src/app/modules/dossiers-listing/config.service.ts | 6 ++++-- .../general-info/edit-dossier-general-info.component.ts | 4 ++-- .../components/dossier-state/dossier-state.component.html | 2 +- apps/red-ui/src/app/services/translate-chart.service.ts | 2 +- .../src/app/translations/audit-categories-translations.ts | 2 +- apps/red-ui/src/app/utils/filter-utils.ts | 3 ++- apps/red-ui/src/assets/i18n/de.json | 6 ++++-- apps/red-ui/src/assets/i18n/en.json | 6 ++++-- .../src/lib/dossier-templates/dashboard-stats.model.ts | 4 ++-- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index c1dcc35df..fd79b73b6 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -106,8 +106,10 @@ export class ConfigService { const dossierStatesFilters = [...allDistinctDossierStates].map( id => new NestedFilter({ - id: id, - label: id ? this._dossierStatesMapService.get(stateToTemplateMap.get(id), id).name : 'Undefined', + id: id ?? 'undefined', + label: id + ? this._dossierStatesMapService.get(stateToTemplateMap.get(id), id).name + : this._translateService.instant('dossier-state.placeholder'), }), ); diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts index 443f074bc..de4f641cd 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts @@ -83,7 +83,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti return this._translateService.instant( this.states.length === 1 ? 'edit-dossier-dialog.general-info.form.dossier-state.no-state-placeholder' - : 'edit-dossier-dialog.general-info.form.dossier-state.placeholder', + : 'dossier-state.placeholder', ) as string; } @@ -174,7 +174,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti getStateName(stateId: string): string { return (this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name || - this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder')) as string; + this._translateService.instant('dossier-state.placeholder')) as string; } getStateColor(stateId: string): string { diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.html index dbd663786..f13edfa7a 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossier-state/dossier-state.component.html @@ -1,6 +1,6 @@
- {{ (dossierState$ | async)?.name || ('edit-dossier-dialog.general-info.form.dossier-state.placeholder' | translate) }} + {{ (dossierState$ | async)?.name || ('dossier-state.placeholder' | translate) }}
diff --git a/apps/red-ui/src/app/services/translate-chart.service.ts b/apps/red-ui/src/app/services/translate-chart.service.ts index 622bf67d9..243789b98 100644 --- a/apps/red-ui/src/app/services/translate-chart.service.ts +++ b/apps/red-ui/src/app/services/translate-chart.service.ts @@ -17,7 +17,7 @@ export class TranslateChartService { translateDossierStates(config: DonutChartConfig[], dossierTemplateId: string): DonutChartConfig[] { return config.map(val => { - if (!val.key) { + if (val.key === 'undefined') { return { ...val, label: this._translateService.instant(val.label) }; } const dossierState = this._dossierStatesMapService.get(dossierTemplateId, val.key); diff --git a/apps/red-ui/src/app/translations/audit-categories-translations.ts b/apps/red-ui/src/app/translations/audit-categories-translations.ts index 64d383092..267dc95a6 100644 --- a/apps/red-ui/src/app/translations/audit-categories-translations.ts +++ b/apps/red-ui/src/app/translations/audit-categories-translations.ts @@ -13,5 +13,5 @@ export const auditCategoriesTranslations = { DOCUMENT: _('audit-screen.categories.document'), AUDIT: _('audit-screen.categories.audit'), DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template'), - // SETTINGS: _('audit-screen.categories.settings'), + SETTINGS: _('audit-screen.categories.settings'), } as const; diff --git a/apps/red-ui/src/app/utils/filter-utils.ts b/apps/red-ui/src/app/utils/filter-utils.ts index 95588751c..9ab679689 100644 --- a/apps/red-ui/src/app/utils/filter-utils.ts +++ b/apps/red-ui/src/app/utils/filter-utils.ts @@ -77,7 +77,8 @@ export const dossierMemberChecker = (dw: Dossier, filter: INestedFilter) => dw.h export const dossierTemplateChecker = (dw: Dossier, filter: INestedFilter) => dw.dossierTemplateId === filter.id; -export const dossierStateChecker = (dw: Dossier, filter: INestedFilter) => dw.dossierStatusId === filter.id; +export const dossierStateChecker = (dw: Dossier, filter: INestedFilter) => + dw.dossierStatusId === (filter.id === 'undefined' ? null : filter.id); export const dossierApproverChecker = (dw: Dossier, filter: INestedFilter) => dw.approverIds.includes(filter.id); diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 04dadafc0..3f5de4650 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -911,6 +911,9 @@ "upload-files": "Sie können Dateien überall per Drag and Drop platzieren..." }, "dossier-permissions": "", + "dossier-state": { + "placeholder": "" + }, "dossier-states-listing": { "action": { "delete": "", @@ -1084,8 +1087,7 @@ }, "dossier-state": { "label": "", - "no-state-placeholder": "", - "placeholder": "" + "no-state-placeholder": "" }, "due-date": "Termin", "name": { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 8485aed6a..6f245a2c6 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -911,6 +911,9 @@ "upload-files": "Drag & drop files anywhere..." }, "dossier-permissions": "Dossier Permissions", + "dossier-state": { + "placeholder": "Undefined" + }, "dossier-states-listing": { "action": { "delete": "Delete State", @@ -1084,8 +1087,7 @@ }, "dossier-state": { "label": "Dossier State", - "no-state-placeholder": "This dossier template has no states", - "placeholder": "Undefined" + "no-state-placeholder": "This dossier template has no states" }, "due-date": "Due Date", "name": { diff --git a/libs/red-domain/src/lib/dossier-templates/dashboard-stats.model.ts b/libs/red-domain/src/lib/dossier-templates/dashboard-stats.model.ts index 204ebc8f0..2e8eefd2c 100644 --- a/libs/red-domain/src/lib/dossier-templates/dashboard-stats.model.ts +++ b/libs/red-domain/src/lib/dossier-templates/dashboard-stats.model.ts @@ -59,8 +59,8 @@ export class DashboardStats implements IListable, IDashboardStats { return this.dossierCountByStatus.map(d => ({ value: d.count, color: '#e2e4e9', - label: 'edit-dossier-dialog.general-info.form.dossier-state.placeholder', - key: d.statusId, + label: 'dossier-state.placeholder', + key: d.statusId ?? 'undefined', })); }