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 915d29570..6dfc4cd8b 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 @@ -65,6 +65,12 @@ > {{ 'edit-dossier-dialog.actions.save' | translate }} + +
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index daef546a9..80d5ce762 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Dossier } from '@red/domain'; import { EditDossierGeneralInfoComponent } from './general-info/edit-dossier-general-info.component'; import { EditDossierDownloadPackageComponent } from './download-package/edit-dossier-download-package.component'; import { EditDossierSectionInterface } from './edit-dossier-section.interface'; -import { Toaster } from '@iqser/common-ui'; +import { IconButtonTypes, Toaster } from '@iqser/common-ui'; import { EditDossierDictionaryComponent } from './dictionary/edit-dossier-dictionary.component'; import { EditDossierTeamMembersComponent } from './team-members/edit-dossier-team-members.component'; import { EditDossierAttributesComponent } from './attributes/edit-dossier-attributes.component'; @@ -22,6 +22,7 @@ type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'member }) export class EditDossierDialogComponent { readonly navItems: { key: Section; title?: string; sideNavTitle?: string }[]; + readonly iconButtonTypes = IconButtonTypes; activeNav: Section; dossier: Dossier; @@ -37,6 +38,7 @@ export class EditDossierDialogComponent { private readonly _appStateService: AppStateService, private readonly _dossiersService: DossiersService, private readonly _changeRef: ChangeDetectorRef, + private readonly _dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) private readonly _data: { dossier: Dossier; @@ -119,8 +121,12 @@ export class EditDossierDialogComponent { } } - async save() { + async save(closeAfterSave: boolean = false) { await this.activeComponent.save(); + + if (closeAfterSave) { + this._dialogRef.close(); + } } revert() { diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 119472d76..7144a3652 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -681,10 +681,10 @@ "stats": { "analysed-pages": "{count} {count, plural, one{page} other{pages}}", "created-on": "Created on {date}", + "deleted": "{count} deleted files", "documents": "{count} {count, plural, one{document} other{documents}}", "due-date": "Due {date}", - "people": "{count} {count, plural, one{user} other{users}}", - "deleted": "{count} deleted files" + "people": "{count} {count, plural, one{user} other{users}}" } }, "download-file": "Download", @@ -701,9 +701,9 @@ "search": "Document name..." }, "header-actions": { + "download-csv": "Download CSV File Report", "edit": "Edit Dossier", - "upload-document": "Upload Document", - "download-csv": "Download CSV File Report" + "upload-document": "Upload Document" }, "new-rule": { "toast": { @@ -827,7 +827,8 @@ "edit-dossier-dialog": { "actions": { "revert": "Revert", - "save": "Save Changes" + "save": "Save", + "save-and-close": "Save & Close" }, "attributes": { "custom-attributes": "Custom Dossier Attributes",