diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 4159358d7..52e9e6f48 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -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, diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 72d647e15..53026b1aa 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -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;