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 943cb8852..75da1652e 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 @@ -82,8 +82,7 @@ export class AdminDialogService extends DialogService { } async deleteUsers(userIds: string[], cb?: () => Promise | void): Promise { - // const result = await firstValueFrom(this._userStatsService.getFor(userIds)); - // console.log('result: ', result); + const userStats = await firstValueFrom(this._userStatsService.getOne(userIds[0])); const data: IConfirmationDialogData = { title: _('confirm-delete-users.title'), @@ -91,7 +90,11 @@ export class AdminDialogService extends DialogService { confirmationText: _('confirm-delete-users.delete'), denyText: _('confirm-delete-users.cancel'), titleColor: TitleColors.WARN, - translateParams: { usersCount: 1, dossiersCount: this._getUsersDossiersCount(userIds) }, + translateParams: { + usersCount: 1, + dossiersCount: userStats.numberOfDossierOwnerships, + documentsCount: userStats.numberOfAssignedFiles, + }, checkboxes: [ { value: false, label: _('confirm-delete-users.impacted-dossiers') }, { value: false, label: _('confirm-delete-users.impacted-documents') }, diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index be2d24c2d..e0115ef7e 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -642,7 +642,7 @@ "confirm-delete-users": { "cancel": "Keep {usersCount, plural, one{user} other{users}}", "delete": "Delete {usersCount, plural, one{user} other{users}}", - "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted", + "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted", "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted", "title": "Delete {usersCount, plural, one{user} other{users}} from workspace", "toast-error": "Please confirm that you understand the consequences of this action.", diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index a90fa21d7..faaf2073e 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -642,7 +642,7 @@ "confirm-delete-users": { "cancel": "Keep {usersCount, plural, one{user} other{users}}", "delete": "Delete {usersCount, plural, one{user} other{users}}", - "impacted-documents": "All documents pending review from the {usersCount, plural, one{user} other{users}} will be impacted", + "impacted-documents": "{documentsCount} {documentsCount, plural, one{document} other{documents}} will be impacted", "impacted-dossiers": "{dossiersCount} {dossiersCount, plural, one{dossier} other{dossiers}} will be impacted", "title": "Delete {usersCount, plural, one{user} other{users}} from workspace", "toast-error": "Please confirm that you understand the consequences of this action.", diff --git a/libs/common-ui b/libs/common-ui index 58382ddfe..fc8be33dc 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 58382ddfeed1d6d4d61f03abd1bbb0dd840afa94 +Subproject commit fc8be33dc6d33642ae207b6ae4c17a6ec254d11a