Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-4937: make unassigned more visible

Browse Source
This commit is contained in:
Dan Percic 2022-08-19 16:55:30 +03:00
parent c9b8c1130a
commit 04f48084d6
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.ts
View File

@ -46,15 +46,27 @@ export class AssignReviewerApproverDialogComponent {
}
get selectedUser(): string {
return this.form.get('user').value;
const value = this.form.get('user').value;
return value === 'undefined' ? undefined : value;
}
get userOptions() {
const unassignUser = this._canUnassignFiles && this.data.withUnassignedOption ? [undefined] : [];
if (this.dossier.hasReviewers && !this.permissionsService.canAssignUser(this.data.files, this.dossier)) {
const unassignUser = this._canUnassignFiles && this.data.withUnassignedOption ? ['undefined'] : [];
const cannotAssignUser = !this.permissionsService.canAssignUser(this.data.files, this.dossier);
if (this.mode === 'reviewer') {
if (this.dossier.hasReviewers && cannotAssignUser) {
return [...unassignUser];
}
return [...this.dossier.memberIds, ...unassignUser];
}
if (this.dossier.approverIds.length > 1 && cannotAssignUser) {
return [...unassignUser];
}
return this.mode === 'reviewer' ? [...this.dossier.memberIds, ...unassignUser] : [...this.dossier.approverIds, ...unassignUser];
return [...this.dossier.approverIds, ...unassignUser];
}
get changed(): boolean {

2
libs/common-ui

@ -1 +1 @@
Subproject commit 61ae1e8bac67338c61f590f1a785d5a26bb1613b
Subproject commit 4c0e6d1beda5b9633e73e5cafd59b5dcf76c5428