From fdcf25a3e31033b1c5a7077daadd8614e62360df Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Wed, 27 Nov 2024 20:18:15 +0200 Subject: [PATCH] RED-10531: enable assignToSelf on error files; display assignee. --- .../components/table-item/table-item.component.html | 8 +++++--- .../components/table-item/table-item.component.scss | 2 +- .../components/file-actions/file-actions.component.ts | 9 ++++++--- apps/red-ui/src/app/services/permissions.service.ts | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html index 5c53ae450..8b36293cf 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.html @@ -23,11 +23,13 @@
+ -
- -
+
+ +
+
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss index ca71f0d3b..217afe43b 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/table-item.component.scss @@ -5,7 +5,7 @@ } .extend-cols { - grid-column-end: span 3; + grid-column-end: span 2; align-items: flex-end; } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 898d91c2c..560e7bee2 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -85,7 +85,7 @@ export class FileActionsComponent { this.isDossierOverview(), ); readonly #showDelete = computed(() => this._permissionsService.canSoftDeleteFile(this.file(), this.dossier())); - readonly #showOCR = computed(() => this._permissionsService.canOcrFile(this.file(), this.dossier())); + readonly #showOCR = computed(() => this._permissionsService.canOcrFile(this.file(), this.dossier()) && !this.file().isError); readonly #canReanalyse = computed(() => this._permissionsService.canReanalyseFile(this.file(), this.dossier())); readonly #canEnableAutoAnalysis = computed(() => this._permissionsService.canEnableAutoAnalysis([this.file()], this.dossier())); readonly #showUnderReview = computed( @@ -113,7 +113,11 @@ export class FileActionsComponent { ); readonly #isDossierMember = computed(() => this._permissionsService.isDossierMember(this.dossier())); readonly #showDownload = computed( - () => this._permissionsService.canDownloadRedactedFile() && !!this.file().lastProcessed && this.#isDossierMember(), + () => + this._permissionsService.canDownloadRedactedFile() && + !!this.file().lastProcessed && + !this.file().isError && + this.#isDossierMember(), ); readonly #showReanalyseFilePreview = computed( () => this.#showReanalyse() && this.isFilePreview() && !this.file().isApproved && this.#isDossierMember(), @@ -163,7 +167,6 @@ export class FileActionsComponent { dossier: this.dossier(), tooltipClass: 'small', show: this.#showDownload(), - disabled: this.file().processingStatus === ProcessingFileStatuses.ERROR, helpModeKey: this.#isDocumine ? 'download_document' : 'download', }, { diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 382711250..6c2956310 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -469,7 +469,7 @@ export class PermissionsService { } #canAssignToSelf(file: File, dossier: Dossier): boolean { - const precondition = this.#fileIsOk(file, dossier) && !this.isFileAssignee(file); + const precondition = (this.#fileIsOk(file, dossier) || file.isError) && !this.isFileAssignee(file); return precondition && (this.isApprover(dossier) || (this.isDossierMember(dossier) && (file.isNew || file.isUnderReview))); }