Skip to content

Commit 09ef264

Browse files
committed
fix: corrected typo in compliance status label from "Complaint" to "Compliant"
1 parent fac42da commit 09ef264

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

frontend/src/app/compliance/compliance-reports-view/compliance-reports-view.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ <h5 class="card-title mb-0 text-uppercase label-header d-flex align-items-center
4949
<tr class="cursor-pointer" (click)="reportDetail = report"
5050
*ngFor="let report of reports; let index = index" style="position: relative; z-index: 1;">
5151
<td style="width: 5%; position: relative; z-index: 0;"
52-
[ngClass]="report.configReportStatus === ComplianceStatus.COMPLAINT ? 'border-left-success' : 'border-left-danger'"
53-
[ngStyle]="report.configReportStatus === ComplianceStatus.COMPLAINT ? {'border-left': '5px solid green !important;'} : {'border-left': '5px solid red !important;'}">
52+
[ngClass]="report.configReportStatus === ComplianceStatus.COMPLIANT ? 'border-left-success' : 'border-left-danger'"
53+
[ngStyle]="report.configReportStatus === ComplianceStatus.COMPLIANT ? {'border-left': '5px solid green !important;'} : {'border-left': '5px solid red !important;'}">
5454
<div>
5555
<app-report-apply-note [report]="report" [showNote]="false"></app-report-apply-note>
5656
</div>
@@ -110,7 +110,7 @@ <h5 class="card-title mb-0 text-uppercase label-header d-flex align-items-center
110110
<div *ngIf="reportDetail" class="utm-right-container">
111111
<div (click)="reportDetail= undefined" class="overlay overlay-lg col-md-7"></div>
112112
<div class="card utm-right-action utm-right-action-lg ml-0">
113-
<div [ngClass]="reportDetail.configReportStatus === ComplianceStatusEnum.COMPLAINT
113+
<div [ngClass]="reportDetail.configReportStatus === ComplianceStatusEnum.COMPLIANT
114114
|| (reportDetail.configReportNote && reportDetail.configReportNote !== '') ? 'border-left-success' : 'border-left-danger'"
115115
class="title d-flex justify-content-between align-items-center border-bottom-1
116116
border-bottom-grey-100 pl-3 pt-3 pr-3 pb-0">

frontend/src/app/compliance/compliance-reports-view/components/compliance-report-detail/compliance-report-detail.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class ComplianceReportDetailComponent implements OnInit {
133133
}
134134

135135
isComplaint() {
136-
return this.report.configReportStatus === ComplianceStatusEnum.COMPLAINT
136+
return this.report.configReportStatus === ComplianceStatusEnum.COMPLIANT
137137
|| (this.report.configReportNote && this.report.configReportNote !== '');
138138
}
139139
}

frontend/src/app/compliance/compliance-reports-view/components/compliance-status/compliance-status.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ng-container *ngIf="template === 'default'">
22
<div>
3-
<span [ngClass]="report.configReportStatus === ComplianceStatus.COMPLAINT ? 'text-success' : 'text-danger'"
3+
<span [ngClass]="report.configReportStatus === ComplianceStatus.COMPLIANT ? 'text-success' : 'text-danger'"
44
class="span-small-icon d-flex justify-content-start align-items-center">
55
{{ isComplaint() ? 'Compliant' : 'Non compliant' }}
66
</span>
@@ -10,7 +10,7 @@
1010
<ng-container *ngIf="template === 'dropdown'">
1111
<span (click)="onClick($event)" ngbDropdown container="body" #drop="ngbDropdown">
1212
<a class="btn btn-light btn-sm"
13-
[ngClass]="(report.configReportNote && report.configReportNote !== '') || report.configReportStatus === ComplianceStatus.COMPLAINT ? 'text-success' : 'text-danger'"
13+
[ngClass]="(report.configReportNote && report.configReportNote !== '') || report.configReportStatus === ComplianceStatus.COMPLIANT ? 'text-success' : 'text-danger'"
1414
ngbDropdownToggle>
1515
<span class="indicator-progress" *ngIf="changing">
1616
<span class="spinner-border spinner-border-sm align-middle me-2"></span>
@@ -27,11 +27,11 @@
2727
class="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg-light-primary fw-semibold font-size-sm py-2 px-3"
2828
ngbDropdownMenu>
2929
<div *ngIf="!isComplaint()" class="menu-item px-2 cursor-pointer menu-hover"
30-
(click)="changeStatusTo(ComplianceStatus.COMPLAINT); drop.close()">
31-
<a style="font-size: 12px" class="menu-link px-2 fw-bolder text-success">{{ 'Complaint' }}</a>
30+
(click)="changeStatusTo(ComplianceStatus.COMPLIANT); drop.close()">
31+
<a style="font-size: 12px" class="menu-link px-2 fw-bolder text-success">{{ 'Compliant' }}</a>
3232
</div>
3333
<div *ngIf="isComplaint()" class="menu-item px-2 cursor-pointer menu-hover"
34-
(click)="changeStatusTo(ComplianceStatus.NON_COMPLAINT); drop.close()">
34+
(click)="changeStatusTo(ComplianceStatus.NON_COMPLIANT); drop.close()">
3535
<a style="font-size: 12px" class="menu-link px-2 fw-bolder text-danger">{{ 'Non compliant' }}</a>
3636
</div>
3737
</div>

frontend/src/app/compliance/compliance-reports-view/components/compliance-status/compliance-status.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class ComplianceStatusComponent implements OnInit {
7979

8080
getModalMessage(status: ComplianceStatusEnum) {
8181
return !this.isComplaint()
82-
? `You are about to change the compliance status to <b>Complaint (External Tool)</b>.
82+
? `You are about to change the compliance status to <b>Compliant (External Tool)</b>.
8383
<br><br>
8484
Please note that you must provide a detailed note explaining where and how this compliance
8585
is being fulfilled using the external tool.
@@ -95,7 +95,7 @@ export class ComplianceStatusComponent implements OnInit {
9595
}
9696

9797
isComplaint() {
98-
return this.report.configReportStatus === ComplianceStatusEnum.COMPLAINT
98+
return this.report.configReportStatus === ComplianceStatusEnum.COMPLIANT
9999
|| (this.report.configReportNote && this.report.configReportNote !== '');
100100
}
101101
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export enum ComplianceStatusEnum {
2-
COMPLAINT = 'COMPLAINT',
3-
NON_COMPLAINT = 'NON_COMPLAINT'
2+
COMPLIANT = 'COMPLIANT',
3+
NON_COMPLIANT = 'NON_COMPLIANT'
44
}

0 commit comments

Comments
 (0)