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

RED-4723: fix set file under review in workflow

Browse Source
This commit is contained in:
Dan Percic 2022-07-25 18:03:22 +03:00
parent 8166ff6933
commit 9d21a4c162
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier-overview/config.service.ts
View File

@ -88,7 +88,7 @@ export class ConfigService {
}
},
enterPredicate: files =>
this._permissionsService.canSetUnderReviewInWorkflow(files, dossier) ||
this._permissionsService.canSetUnderReview(files, dossier) ||
this._permissionsService.canAssignToSelf(files, dossier) ||
this._permissionsService.canAssignUser(files, dossier),
key: UNDER_REVIEW,

16
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -137,11 +137,6 @@ export class PermissionsService {
return files.reduce((acc, _file) => this._canSetUnderReview(_file, dossier) && acc, true);
}
canSetUnderReviewInWorkflow(file: File | File[], dossier: Dossier): boolean {
const files = file instanceof File ? [file] : file;
return files.reduce((acc, _file) => this._canSetUnderReviewInWorkflow(_file, dossier) && acc, true);
}
canBeApproved(file: File | File[], dossier: Dossier): boolean {
const files = file instanceof File ? [file] : file;
return files.reduce((acc, _file) => this._canBeApproved(_file, dossier) && acc, true);
@ -317,17 +312,6 @@ export class PermissionsService {
return (file.isUnderApproval && this.isAssigneeOrApprover(file, dossier)) || (file.isNew && this.isDossierMember(dossier));
}
/** UNDER_APPROVAL => UNDER_REVIEW OR NEW => UNDER_REVIEW OR APPROVED => UNDER_REVIEW*/
private _canSetUnderReviewInWorkflow(file: File, dossier: Dossier): boolean {
if (!dossier.isActive) {
return false;
}
const isApprovedOrUnderApproval = file.isApproved || file.isUnderApproval;
return (isApprovedOrUnderApproval && this.isAssigneeOrApprover(file, dossier)) || (file.isNew && this.isDossierMember(dossier));
}
/** UNDER_APPROVAL => APPROVED */
private _canBeApproved(file: File, dossier: Dossier): boolean {
return this._isReadyForApproval(file, dossier) && file.canBeApproved;