From 3e09243c27fa4f93bd2cf7dd311d852b14fab1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 30 May 2023 23:28:06 +0300
Subject: [PATCH] RED-5875: Material upgrade - buttons: circle button

---
 .../notifications.component.scss              |  4 +-
 .../edit-dossier-attributes.component.html    | 46 +++++++++----------
 .../team-members/team-members.component.html  |  2 +-
 .../src/app/services/permissions.service.ts   |  2 +-
 libs/common-ui                                |  2 +-
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss
index d366b2d81..57b77036c 100644
--- a/apps/red-ui/src/app/components/notifications/notifications.component.scss
+++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss
@@ -1,5 +1,3 @@
-@use 'variables';
-
 ::ng-deep .notifications-backdrop + .cdk-overlay-connected-position-bounding-box {
     right: 0 !important;
 
@@ -67,7 +65,7 @@
             }
 
             &.unread {
-                background-color: rgba(variables.$primary, 0.1);
+                background-color: rgba(var(--iqser-primary-rgb), 0.1);
 
                 .dot {
                     background-color: var(--iqser-primary);
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
index 9c3d18d86..1af05cdf0 100644
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
@@ -12,12 +12,12 @@
 
         <iqser-dynamic-input
             *ngFor="let attr of customAttributes"
+            [canEditInput]="!disabled"
             [classList]="'w-full'"
             [formControlName]="attr.id"
             [id]="attr.id"
             [label]="attr.label"
             [type]="attr.type"
-            [canEditInput]="!disabled"
         ></iqser-dynamic-input>
     </div>
 
@@ -39,32 +39,30 @@
             [class.displayed-preview]="currentAttrValue(attr)"
             class="iqser-input-group image-attribute"
         >
-            <div>
-                <img *ngIf="currentAttrValue(attr)" [alt]="attr.label" [src]="currentAttrValue(attr)" />
+            <img *ngIf="currentAttrValue(attr)" [alt]="attr.label" [src]="currentAttrValue(attr)" />
 
-                <label>{{ attr.label }}</label>
+            <label>{{ attr.label }}</label>
 
-                <iqser-icon-button
-                    (action)="fileInputClick(attr)"
-                    *ngIf="!currentAttrValue(attr)"
-                    [disabled]="disabled"
-                    [label]="'edit-dossier-dialog.attributes.upload-image' | translate"
-                    [type]="iconButtonTypes.dark"
-                    class="upload-button"
-                    icon="iqser:upload"
-                ></iqser-icon-button>
+            <iqser-icon-button
+                (action)="fileInputClick(attr)"
+                *ngIf="!currentAttrValue(attr)"
+                [disabled]="disabled"
+                [label]="'edit-dossier-dialog.attributes.upload-image' | translate"
+                [type]="iconButtonTypes.dark"
+                class="upload-button"
+                icon="iqser:upload"
+            ></iqser-icon-button>
 
-                <input
-                    #fileInput
-                    (change)="uploadImage($event, attr)"
-                    [id]="attr.id"
-                    [name]="attr.id"
-                    accept="image/jpg, image/jpeg, image/png"
-                    class="file-upload-input"
-                    hidden
-                    type="file"
-                />
-            </div>
+            <input
+                #fileInput
+                (change)="uploadImage($event, attr)"
+                [id]="attr.id"
+                [name]="attr.id"
+                accept="image/jpg, image/jpeg, image/png"
+                class="file-upload-input"
+                hidden
+                type="file"
+            />
 
             <div *ngIf="currentAttrValue(attr) && !disabled">
                 <iqser-circle-button
diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
index 4a7ea8e6f..86d6a1395 100644
--- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
@@ -20,12 +20,12 @@
     <iqser-circle-button
         (action)="openEditDossierDialog()"
         *allow="roles.dossiers.edit; if: currentUser.isManager && canAdd"
+        [attr.help-mode-key]="'edit_dossier_members'"
         [class.large-spacing]="largeSpacing"
         [icon]="'iqser:plus'"
         [size]="32"
         [tooltip]="'dossier-details.assign-members' | translate"
         [type]="circleButtonTypes.primary"
-        [attr.help-mode-key]="'edit_dossier_members'"
         class="member"
     ></iqser-circle-button>
 </div>
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index 2f915f76f..79a6708d8 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -394,7 +394,7 @@ export class PermissionsService {
 
     private _canEnableAutoAnalysis(file: File, dossier: Dossier): boolean {
         return (
-            dossier.isActive && !!file.lastProcessed && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved
+            dossier.isActive && file.excludedFromAutomaticAnalysis && this.isFileAssignee(file) && !file.isApproved && !!file.lastProcessed
         );
     }
 
diff --git a/libs/common-ui b/libs/common-ui
index 471485653..a71a09463 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 471485653184e6489f112d11b0792c3a10643c65
+Subproject commit a71a09463f092eea0ccbb4d21ca2f0f9416c4c6f