From 4cae5b9626d27c74461a5e67cb764134fd39d1f9 Mon Sep 17 00:00:00 2001
From: JaysinhGo <jay@paladincloud.io>
Date: Thu, 6 Jun 2024 14:39:23 +0530
Subject: [PATCH 1/2] feat:[UIUX-707] remove box icon from the empty and other
 error state message

---
 webapp/src/app/shared/error-message/error-message.component.css  | 1 +
 webapp/src/app/shared/error-message/error-message.component.html | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/app/shared/error-message/error-message.component.css b/webapp/src/app/shared/error-message/error-message.component.css
index 8fa40a6c83..664c74312e 100644
--- a/webapp/src/app/shared/error-message/error-message.component.css
+++ b/webapp/src/app/shared/error-message/error-message.component.css
@@ -49,6 +49,7 @@
     padding: 5px;
     font: var(--text-body-2);
     color: var(--text-medium-emphasis);
+    font-size: 16px;
 }
 
 .error-state-wrapper img {
diff --git a/webapp/src/app/shared/error-message/error-message.component.html b/webapp/src/app/shared/error-message/error-message.component.html
index 92c856d26a..6fd44a7c00 100644
--- a/webapp/src/app/shared/error-message/error-message.component.html
+++ b/webapp/src/app/shared/error-message/error-message.component.html
@@ -13,7 +13,6 @@
  -->
 
 <div class="error-state-wrapper flex-col" *ngIf="errorMessages != undefined">
-    <img [src]="errorMessages.image" alt="" />
     <p class="bold-text">
         {{ errorMessages.title }}
     </p>

From 183123a05d08ea12ba6702d282a13fe07c909fbd Mon Sep 17 00:00:00 2001
From: JaysinhGo <jay@paladincloud.io>
Date: Fri, 7 Jun 2024 12:06:59 +0530
Subject: [PATCH 2/2] feat:[UIUX-707] asset details error message update

---
 .../modules/assets/asset-details/asset-details.component.ts  | 2 +-
 .../modules/compliance/card/card.component.html              | 2 +-
 .../compliance-dashboard/compliance-dashboard.component.ts   | 1 +
 webapp/src/app/shared/constants/messages.ts                  | 5 +++--
 .../src/app/shared/error-message/error-message.component.css | 1 -
 .../app/shared/error-message/error-message.component.html    | 1 +
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/src/app/pacman-features/modules/assets/asset-details/asset-details.component.ts b/webapp/src/app/pacman-features/modules/assets/asset-details/asset-details.component.ts
index 8c2b2a7adc..3cf33be54a 100644
--- a/webapp/src/app/pacman-features/modules/assets/asset-details/asset-details.component.ts
+++ b/webapp/src/app/pacman-features/modules/assets/asset-details/asset-details.component.ts
@@ -679,7 +679,7 @@ export class AssetDetailsComponent implements OnInit, AfterViewInit, OnDestroy {
                                 this.policyAvailable[0] = true;
                                 this.showLoader[0] = true;
                             } else {
-                                this.violationErrorMessage = 'noDataAvailable';
+                                this.violationErrorMessage = 'noViolationsForAsset';
                                 this.policyValue = false;
                                 this.showLoader[0] = true;
                                 this.summary.violation = true;
diff --git a/webapp/src/app/pacman-features/modules/compliance/card/card.component.html b/webapp/src/app/pacman-features/modules/compliance/card/card.component.html
index 2b84930a85..509dfb28da 100644
--- a/webapp/src/app/pacman-features/modules/compliance/card/card.component.html
+++ b/webapp/src/app/pacman-features/modules/compliance/card/card.component.html
@@ -39,7 +39,7 @@
             ></app-asset-trend-graph>
         </div>
     </mat-card-content>
-    <mat-card-actions *ngIf="card.footer">
+    <mat-card-actions *ngIf="card.footer && !dataError">
         <button (click)="card.cardButtonAction()">
             {{ card.footer }} <img src="/assets/icons/right-arrow-icon.svg" />
         </button>
diff --git a/webapp/src/app/pacman-features/modules/compliance/compliance-dashboard/compliance-dashboard.component.ts b/webapp/src/app/pacman-features/modules/compliance/compliance-dashboard/compliance-dashboard.component.ts
index 3565528730..3a4481dbab 100644
--- a/webapp/src/app/pacman-features/modules/compliance/compliance-dashboard/compliance-dashboard.component.ts
+++ b/webapp/src/app/pacman-features/modules/compliance/compliance-dashboard/compliance-dashboard.component.ts
@@ -804,6 +804,7 @@ export class ComplianceDashboardComponent implements OnInit, OnDestroy {
         this.policyDataError = '';
         this.updatePoliciesTable();
         this.getDistributionBySeverity();
+        this.getComplianceData();
     }
 
     updatePoliciesTable() {
diff --git a/webapp/src/app/shared/constants/messages.ts b/webapp/src/app/shared/constants/messages.ts
index eed038ee68..a2e92ffd5b 100644
--- a/webapp/src/app/shared/constants/messages.ts
+++ b/webapp/src/app/shared/constants/messages.ts
@@ -115,9 +115,7 @@ export const MESSAGES = {
             image: '/assets/images/empty-state.svg',
         },
         noPolicyFound: {
-            title: '',
             description: 'There are no active Policies for this Asset Type.',
-            image: '/assets/images/empty-state.svg',
         },
         noSearchFound: {
             title: 'No Search Found!!',
@@ -133,5 +131,8 @@ export const MESSAGES = {
             description: 'The trend graph requires upto two days to display data.',
             image: '/assets/images/glass-timer.svg',
         },
+        noViolationsForAsset: {
+            description: 'There are no violations for this asset.',
+        },
     },
 };
diff --git a/webapp/src/app/shared/error-message/error-message.component.css b/webapp/src/app/shared/error-message/error-message.component.css
index 664c74312e..8fa40a6c83 100644
--- a/webapp/src/app/shared/error-message/error-message.component.css
+++ b/webapp/src/app/shared/error-message/error-message.component.css
@@ -49,7 +49,6 @@
     padding: 5px;
     font: var(--text-body-2);
     color: var(--text-medium-emphasis);
-    font-size: 16px;
 }
 
 .error-state-wrapper img {
diff --git a/webapp/src/app/shared/error-message/error-message.component.html b/webapp/src/app/shared/error-message/error-message.component.html
index 6fd44a7c00..92c856d26a 100644
--- a/webapp/src/app/shared/error-message/error-message.component.html
+++ b/webapp/src/app/shared/error-message/error-message.component.html
@@ -13,6 +13,7 @@
  -->
 
 <div class="error-state-wrapper flex-col" *ngIf="errorMessages != undefined">
+    <img [src]="errorMessages.image" alt="" />
     <p class="bold-text">
         {{ errorMessages.title }}
     </p>