From b84d808367b246c200f0dc23f107a1342efacecc Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Mon, 24 Jul 2023 15:11:42 +0300 Subject: [PATCH] DM-333: Changes in Dossier dialog. --- .../dossier-details.component.html | 2 +- .../dossier-details.component.ts | 3 +- .../edit-dossier-dialog.component.html | 20 ++++++----- .../edit-dossier-dialog.component.ts | 4 +++ .../edit-dossier-team.component.html | 36 ++++++++++--------- .../edit-dossier-team.component.ts | 4 ++- apps/red-ui/src/assets/i18n/scm/en.json | 2 +- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index 0d2a2d4f8..9ccf61221 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -33,7 +33,7 @@
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts index eb401f1d0..28c23f3fe 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.ts @@ -13,7 +13,7 @@ import { } from '@red/domain'; import { TranslateChartService } from '@services/translate-chart.service'; import { UserService } from '@users/user.service'; -import { ProgressBarConfigModel, Toaster } from '@iqser/common-ui'; +import { getConfig, ProgressBarConfigModel, Toaster } from '@iqser/common-ui'; import { workflowFileStatusTranslations } from '@translations/file-status-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { combineLatestWith, firstValueFrom } from 'rxjs'; @@ -49,6 +49,7 @@ export class DossierDetailsComponent extends ContextComponent -
- {{ item.sideNavTitle || item.title | translate }} - +
+
+ {{ item.sideNavTitle || item.title | translate }} + +
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 75bcc993e..311902349 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -17,6 +17,7 @@ import { DossiersService } from '@services/dossiers/dossiers.service'; import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider'; import { Roles } from '@users/roles'; import { getCurrentUser } from '@iqser/common-ui/lib/users'; +import { ConfigService } from '@services/config.service'; type Section = 'dossierInfo' | 'downloadPackage' | 'dossierDictionary' | 'members' | 'dossierAttributes'; @@ -26,6 +27,7 @@ interface NavItem { sideNavTitle?: string; readonly?: boolean; helpModeKey?: string; + hide?: boolean; } @Component({ @@ -57,6 +59,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A dossierId: string; section?: Section; }, + readonly configService: ConfigService, ) { super(_dialogRef, true); this.dossier$ = this._dossiersService.getEntityChanged$(_data.dossierId).pipe( @@ -172,6 +175,7 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A title: _('edit-dossier-dialog.nav-items.dossier-dictionary'), readonly: !this._permissionsService.canEditDossierDictionary(this._dossier), helpModeKey: 'edit_dossier_dossier_dictionary_DIALOG', + hide: this.configService.values.IS_DOCUMINE, }, { key: 'members', diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index b444ecbf5..caa19584f 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -26,22 +26,24 @@ -
+
+
- + - -
{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}
-
+ +
{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}
+
+
-
+
u.isManager).map(m => m.id); readonly selectedReviewers$ = this.#formValue$.pipe(map(v => v.members.filter(m => !v.approvers.includes(m)))); readonly selectedApprovers$ = this.#formValue$.pipe(map(v => v.approvers)); + readonly isDocumine = getConfig().IS_DOCUMINE; get valid(): boolean { return this.form.valid; @@ -94,7 +96,7 @@ export class EditDossierTeamComponent implements EditDossierSectionInterface, On approversControl.patchValue(currentApprovers.filter(a => a !== userId)); } else { approversControl.patchValue([...currentApprovers, userId]); - if (!this.isMemberSelected(userId)) { + if (!this.isMemberSelected(userId) && !this.isDocumine) { this.toggleSelected(userId); } } diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index f1885e2b9..f84ca0299 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -447,7 +447,7 @@ "assign-dossier-owner": { "dialog": { "approver": "Approver", - "approvers": "Approvers", + "approvers": "Dossier Members", "make-approver": "Make Approver", "no-reviewers": "No members with \"review only\" permission.", "reviewers": "Reviewers",