Merge pull request #2126 from PaladinCloud/fix/UIUX-612/exemption-but…

…ton-disable-closed-violations fix:[UIUX-612] disable exemption for closed violation
PaladinCloud · Mar 4, 2024 · af7849c · af7849c
2 parents a513d36 + 99651c8
commit af7849c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/webapp/src/app/pacman-features/modules/compliance/issue-details/issue-details.component.html b/webapp/src/app/pacman-features/modules/compliance/issue-details/issue-details.component.html
@@ -77,9 +77,9 @@ <h6 class="page-title">Violation Details -</h6>
                     Additional Actions
                 </header>
                 <div class="btn-wrapper-additional-actions">
-                    <app-button-icon [class.isDisabled]="issueAssetGroup=='redhat'" (onClickInner)="showOtherDiv()" *ngIf="!exceptionAdded && exemptionDetails.status != 'requested'"> {{addExemption}}
+                    <app-button-icon [disabled]="disableExemption" [class.isDisabled]="disableExemption" (onClickInner)="showOtherDiv()" *ngIf="!exceptionAdded && exemptionDetails.status != 'requested'"> {{addExemption}}
                     </app-button-icon>
-                    <app-button-icon [class.isDisabled]="issueAssetGroup=='redhat'" (onClickInner)="showOtherDivRevoke();revokeException()"
+                    <app-button-icon [disabled]="disableExemption" [class.isDisabled]="disableExemption" (onClickInner)="showOtherDivRevoke();revokeException()"
                                      *ngIf="(exceptionAdded && adminAccess) || (!adminAccess && exemptionDetails.status == 'requested' && hasCurrentUserRequested)"> {{revokeExemption}}
                     </app-button-icon>
                 </div>

diff --git a/webapp/src/app/pacman-features/modules/compliance/issue-details/issue-details.component.ts b/webapp/src/app/pacman-features/modules/compliance/issue-details/issue-details.component.ts
@@ -225,6 +225,7 @@ export class IssueDetailsComponent implements OnInit, OnDestroy {
   sortColName: any;
   violationModifiedDate: any;
   hasCurrentUserRequested: boolean;
+  disableExemption: boolean = false;
 
   @HostListener('document:click', ['$event']) handleClick(event) {
     try {
@@ -430,6 +431,7 @@ export class IssueDetailsComponent implements OnInit, OnDestroy {
                       footer: this.issueBlocks.status,
                       img: statusIcon
                     };
+                    this.disableExemptionOnCloseStatus(this.issueBlocks?.status);
                     this.issueTopblocks.push(obj);
                   }
                   this.violationReason = this.issueBlocks.violationReason;
@@ -1366,6 +1368,11 @@ export class IssueDetailsComponent implements OnInit, OnDestroy {
     this.direction = event.direction;
   }
 
+  private disableExemptionOnCloseStatus(status:string){
+    if(status === 'closed') this.disableExemption =true;
+  }
+
+
   ngOnDestroy() {
     try {
       // pushes the current url to datastore