From 0d94391c069f7d82c15f31c138d35a4c867e76f1 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Wed, 12 Apr 2023 09:42:10 -0400
Subject: [PATCH] Updated the if check to get the correct UUID

---
 .../portal/util/CertificateStringMapBuilder.java            | 6 ++++--
 .../src/main/webapp/WEB-INF/jsp/certificate-details.jsp     | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java
index 7281f182..fbfd4c5e 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/util/CertificateStringMapBuilder.java
@@ -379,8 +379,10 @@ public final class CertificateStringMapBuilder {
                 HashMap<Integer, String> results = new HashMap<>();
                 for (ComponentResult componentResult : componentResultManager
                         .getComponentResultList()) {
-                    if (componentResult.getId().equals(certificate.getId())) {
-                        results.put(componentResult.getComponentHash(), componentResult.getExpected());
+                    if (componentResult.getCertificateId()
+                            .equals(certificate.getId())) {
+                        results.put(componentResult.getComponentHash(),
+                                componentResult.getExpected());
                     }
                 }
 
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
index 9a4954f1..60fb3bee 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
@@ -619,9 +619,8 @@
                                                             <div class="panel panel-default">
                                                                 <c:choose>
                                                                     <c:when test="${fn:contains(initialData.failures, combined)}">
-                                                                        <div class="tooltip" style="background-color: red; color: white">
                                                                         <c:set var="expected" value="${initialData.componentResults[combined]}" scope="page" />
-                                                                        <span class="tooltiptext" title="${expected}">
+                                                                        <div class="tooltip" style="background-color: red; color: white" title="Testing">
                                                                     </c:when>
                                                                     <c:otherwise>
                                                                         <div class="panel-heading">
@@ -635,9 +634,6 @@
                                                                             <span data-toggle="tooltip" data-placement="top" title="Component Class">Platform Components</span>
                                                                         </c:otherwise>
                                                                     </c:choose>
-                                                                    <c:when test="${fn:contains(initialData.failures, combined)}">
-                                                                        </span>
-                                                                    </c:when>
                                                                 </div>
                                                                 <div class="panel-body">
                                                                     <span class="fieldHeader">Manufacturer:</span>