From 00fbdf2cdea47a5218ccfda2d66b3bdf7a240165 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Wed, 20 Sep 2023 12:08:32 +0200
Subject: [PATCH] =?UTF-8?q?RED-7521=20-=20=E2=80=9CNew=20file=20attribute?=
 =?UTF-8?q?=E2=80=9D=20button,=20the=20"Edit=20file=20attribute"=20and=20"?=
 =?UTF-8?q?Delete=20file=20attribute"=20icons=20are=20missing=20in=20the?=
 =?UTF-8?q?=20file=20attribute=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file-attributes-listing-screen.component.html            | 4 ++--
 apps/red-ui/src/app/services/permissions.service.ts          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
index 0985f9e47..b3b0651ff 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
@@ -59,7 +59,7 @@
 
         <iqser-icon-button
             (action)="openAddEditAttributeDialog()"
-            *ngIf="permissionsService.canEditGlobalFileAttributes()"
+            *allow="roles.fileAttributes.writeConfig; if: currentUser.isAdmin"
             [attr.help-mode-key]="'create_new_file_attribute'"
             [label]="'file-attributes-listing.add-new' | translate"
             [type]="iconButtonTypes.primary"
@@ -105,7 +105,7 @@
         </div>
 
         <div class="cell">
-            <div *ngIf="permissionsService.canEditGlobalFileAttributes()" class="action-buttons">
+            <div *allow="roles.fileAttributes.writeConfig; if: currentUser.isAdmin" class="action-buttons">
                 <div [attr.help-mode-key]="'edit_delete_file_attribute'">
                     <iqser-circle-button
                         (action)="openAddEditAttributeDialog(attribute)"
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index e842766e4..62c0aacf0 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -40,7 +40,7 @@ export class PermissionsService {
     }
 
     canEditGlobalFileAttributes() {
-        return this._iqserPermissionsService.has(Roles.fileAttributes.write) && this.isAdmin();
+        return this._iqserPermissionsService.has(Roles.fileAttributes.writeConfig) && this.isAdmin();
     }
 
     canEditGlobalDossierAttributes() {
@@ -93,7 +93,8 @@ export class PermissionsService {
     canEditFileAttributes(file: File, dossier: Dossier): boolean {
         return (
             dossier.isActive &&
-            (((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier)))
+            (((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier))) &&
+            this._iqserPermissionsService.has(Roles.fileAttributes.write)
         );
     }