@@ -89,7 +95,7 @@
>
;
readonly #dossierTemplateId: string;
constructor(
@@ -58,16 +59,11 @@ export class DossierAttributesListingScreenComponent extends ListingComponent {
+ async openConfirmDeleteAttributeDialog($event: MouseEvent, attributes: DossierAttributeConfig[] = this.listingService.selected) {
+ await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this.impactedTemplatesRef, $event, async () => {
this._loadingService.start();
- const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id);
- await firstValueFrom(this._dossierAttributesService.delete(ids, dossierTemplateId));
+ const ids = attributes.map(a => a.id);
+ await firstValueFrom(this._dossierAttributesService.delete(ids, this.#dossierTemplateId));
await this._loadData();
});
}
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index b8df7eacf..355f56117 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -37,6 +37,12 @@
+
+
+ - {{ template.fileName }}
+
+
+
;
private _existingConfiguration: IFileAttributesConfig;
@ViewChild('fileInput') private _fileInput: ElementRef;
readonly #dossierTemplateId: string;
@@ -93,25 +104,15 @@ export class FileAttributesListingScreenComponent extends ListingComponent {
+ async openConfirmDeleteAttributeDialog(
+ $event: MouseEvent,
+ attributes: FileAttributeConfig[] = this.listingService.selected,
+ ): Promise {
+ await this._dialogService.deleteAttributes(attributes, this.#dossierTemplateId, this.impactedTemplatesRef, $event, async () => {
this._loadingService.start();
- if (fileAttribute) {
- await firstValueFrom(this._fileAttributesService.deleteFileAttributes([fileAttribute.id], dossierTemplateId));
- } else {
- await firstValueFrom(
- this._fileAttributesService.deleteFileAttributes(
- this.listingService.selected.map(f => f.id),
- dossierTemplateId,
- ),
- );
- }
- await this._dossierTemplatesService.refreshDossierTemplate(dossierTemplateId);
+ const ids = attributes.map(a => a.id);
+ await firstValueFrom(this._fileAttributesService.deleteFileAttributes(ids, this.#dossierTemplateId));
+ await firstValueFrom(this._dossierTemplatesService.refreshDossierTemplate(this.#dossierTemplateId));
await this._loadData();
});
}
@@ -148,7 +149,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent implement
}
openDeleteUsersDialog(userIds: string[], $event?: MouseEvent) {
- this._dialogService.openDialog('deleteUsers', $event, userIds, async () => {
+ this._dialogService.deleteUsers(userIds, $event, async () => {
await this._loadData();
});
}
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 38fd85808..24d471313 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
@@ -1,31 +1,42 @@
-import { Injectable } from '@angular/core';
+import { Injectable, TemplateRef } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component';
-import { ConfirmDeleteAttributeDialogComponent } from '../dialogs/confirm-delete-attribute-dialog/confirm-delete-attribute-dialog.component';
import { EditColorDialogComponent } from '../dialogs/edit-color-dialog/edit-color-dialog.component';
import { SmtpAuthDialogComponent } from '../dialogs/smtp-auth-dialog/smtp-auth-dialog.component';
import { AddEditUserDialogComponent } from '../dialogs/add-edit-user-dialog/add-edit-user-dialog.component';
-import { ConfirmDeleteUsersDialogComponent } from '../dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component';
import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component';
import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component';
-import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui';
+import {
+ ConfirmationDialogComponent,
+ ConfirmationDialogInput,
+ ConfirmOptions,
+ DialogConfig,
+ DialogService,
+ largeDialogConfig,
+ LoadingService,
+ TitleColors,
+} 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';
import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+import { firstValueFrom, forkJoin } from 'rxjs';
+import { ActiveDossiersService } from '@services/entity-services/active-dossiers.service';
+import { UserService } from '../../../services/user.service';
+import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain';
+import { ReportTemplateService } from '../../../services/report-template.service';
type DialogType =
| 'confirm'
| 'addEditDictionary'
| 'editColor'
| 'addEditFileAttribute'
- | 'deleteAttribute'
| 'importFileAttributes'
| 'fileAttributesConfigurations'
| 'addEditUser'
- | 'deleteUsers'
| 'smtpAuthConfig'
| 'addEditDossierTemplate'
| 'addEditDossierAttribute'
@@ -52,10 +63,6 @@ export class AdminDialogService extends DialogService {
component: AddEditFileAttributeDialogComponent,
dialogConfig: { autoFocus: true },
},
- deleteAttribute: {
- component: ConfirmDeleteAttributeDialogComponent,
- dialogConfig: { disableClose: false },
- },
fileAttributesConfigurations: {
component: FileAttributesConfigurationsDialogComponent,
},
@@ -63,10 +70,6 @@ export class AdminDialogService extends DialogService {
component: FileAttributesCsvImportDialogComponent,
dialogConfig: { ...largeDialogConfig, ...{ disableClose: false } },
},
- deleteUsers: {
- component: ConfirmDeleteUsersDialogComponent,
- dialogConfig: { autoFocus: true, disableClose: false },
- },
addEditUser: {
component: AddEditUserDialogComponent,
dialogConfig: { autoFocus: true },
@@ -94,7 +97,88 @@ export class AdminDialogService extends DialogService {
},
};
- constructor(protected readonly _dialog: MatDialog) {
+ constructor(
+ protected readonly _dialog: MatDialog,
+ private readonly _activeDossiersService: ActiveDossiersService,
+ private readonly _loadingService: LoadingService,
+ private readonly _userService: UserService,
+ private readonly _reportTemplateService: ReportTemplateService,
+ ) {
super(_dialog);
}
+
+ deleteUsers(userIds: string[], $event?: MouseEvent, cb?: () => Promise | void): void {
+ const data = new ConfirmationDialogInput({
+ title: _('confirm-delete-users.title'),
+ question: _('confirm-delete-users.warning'),
+ confirmationText: _('confirm-delete-users.delete'),
+ denyText: _('confirm-delete-users.cancel'),
+ titleColor: TitleColors.WARN,
+ translateParams: { usersCount: 1, dossiersCount: this._getUsersDossiersCount(userIds) },
+ checkboxes: [
+ { value: false, label: _('confirm-delete-users.impacted-dossiers') },
+ { value: false, label: _('confirm-delete-users.impacted-documents') },
+ ],
+ toastMessage: _('confirm-delete-users.toast-error'),
+ });
+
+ this.openDialog('confirm', $event, data, async result => {
+ if (result === ConfirmOptions.CONFIRM) {
+ this._loadingService.start();
+ await firstValueFrom(this._userService.delete(userIds));
+ await cb();
+ this._loadingService.stop();
+ }
+ });
+ }
+
+ async deleteAttributes(
+ attributes: IFileAttributeConfig[] | IDossierAttributeConfig[],
+ dossierTemplateId: string,
+ impactedTemplatesRef: TemplateRef,
+ $event?: MouseEvent,
+ cb?: () => Promise | void,
+ ): Promise {
+ this._loadingService.start();
+ const templates$ = attributes
+ .map(a => a.placeholder)
+ .map(placeholder => this._reportTemplateService.getTemplatesByPlaceholder(dossierTemplateId, placeholder as string));
+ const templates: IReportTemplate[] = (await firstValueFrom(forkJoin(templates$))).flat();
+ const templateIds = new Set(templates.map(t => t.templateId));
+ const uniqueTemplates = Array.from(templateIds).map(id => templates.find(t => t.templateId === id));
+ this._loadingService.stop();
+
+ const data = new ConfirmationDialogInput({
+ title: _('confirm-delete-file-attribute.title'),
+ question: _('confirm-delete-file-attribute.warning'),
+ confirmationText: _('confirm-delete-file-attribute.delete'),
+ denyText: _('confirm-delete-file-attribute.cancel'),
+ titleColor: TitleColors.WARN,
+ checkboxes: [
+ {
+ value: false,
+ label: 'confirm-delete-file-attribute.file-impacted-documents',
+ },
+ { value: false, label: 'confirm-delete-file-attribute.file-lost-details' },
+ ],
+ toastMessage: _('confirm-delete-file-attribute.toast-error'),
+ translateParams: { reportsCount: uniqueTemplates.length, count: attributes.length, name: attributes[0].label },
+ });
+ if (templates.length) {
+ data.checkboxes.push({
+ value: false,
+ label: _('confirm-delete-file-attribute.impacted-report'),
+ extraContent: impactedTemplatesRef,
+ extraContentData: { templates: uniqueTemplates },
+ });
+ }
+ this.openDialog('confirm', $event, data, async () => {
+ await cb();
+ });
+ }
+
+ private _getUsersDossiersCount(userIds: string[]): number {
+ return this._activeDossiersService.all.filter(dw => userIds.reduce((prev, userId) => prev || dw.memberIds.includes(userId), false))
+ .length;
+ }
}
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html
deleted file mode 100644
index a076d6010..000000000
--- a/apps/red-ui/src/app/modules/dossier/dialogs/confirm-archive-dossier-dialog/confirm-archive-dossier-dialog.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ checkbox.label | translate }}
-
-
-
-
-