From 1436cafb55a4d29571c7dcce7a2ec2c48058e991 Mon Sep 17 00:00:00 2001
From: chubtub <43381989+chubtub@users.noreply.github.com>
Date: Wed, 2 Feb 2022 10:39:22 -0500
Subject: [PATCH] Rename tpm-events to rim-database.  Add link to index page.

---
 .../java/hirs/attestationca/portal/page/Page.java    |  2 +-
 ...ontroller.java => RimDatabasePageController.java} | 12 +++++-------
 .../src/main/webapp/WEB-INF/jsp/index.jsp            |  4 ++++
 .../WEB-INF/jsp/{tpm-events.jsp => rim-database.jsp} |  0
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/{TpmEventsPageController.java => RimDatabasePageController.java} (95%)
 rename HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/{tpm-events.jsp => rim-database.jsp} (100%)

diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java
index 4dd20d23..a3228d8b 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java
@@ -61,7 +61,7 @@ public enum Page {
     /**
      * Page that manages Attestation CA Policy.
      */
-    POLICY("Policy", "ic_subtitles"),
+    RIM_DATABASE("RIM Database", null, "first"),
     /**
      * Help page.
      */
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/TpmEventsPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java
similarity index 95%
rename from HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/TpmEventsPageController.java
rename to HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java
index 79ee73d0..e1c66ee6 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/TpmEventsPageController.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java
@@ -40,8 +40,8 @@ import java.text.SimpleDateFormat;
  * Controller for the TPM Events page.
  */
 @Controller
-@RequestMapping("/tpm-events")
-public class TpmEventsPageController
+@RequestMapping("/rim-database")
+public class RimDatabasePageController
         extends PageController<NoPageParams> {
 
     private static final String BIOS_RELEASE_DATE_FORMAT = "yyyy-MM-dd";
@@ -51,7 +51,7 @@ public class TpmEventsPageController
     private final ReferenceDigestManager referenceDigestManager;
     private final ReferenceEventManager referenceEventManager;
     private static final Logger LOGGER
-            = LogManager.getLogger(TpmEventsPageController.class);
+            = LogManager.getLogger(RimDatabasePageController.class);
 
     /**
      * This class was created for the purposes of avoiding findbugs message: As
@@ -103,12 +103,10 @@ public class TpmEventsPageController
      * @param referenceEventManager  the referenceEventManager object
      */
     @Autowired
-    public TpmEventsPageController(
-            final DBReferenceManifestManager referenceManifestManager,
+    public RimDatabasePageController(
             final DBReferenceDigestManager referenceDigestManager,
             final DBReferenceEventManager referenceEventManager) {
-        super(Page.TPM_EVENTS);
-        this.referenceManifestManager = referenceManifestManager;
+        super(Page.RIM_DATABASE);
         this.referenceDigestManager = referenceDigestManager;
         this.referenceEventManager = referenceEventManager;
         this.biosValidator = new BiosDateValidator(BIOS_RELEASE_DATE_FORMAT);
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
index 5fdd2f58..366a3e0a 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -67,6 +67,10 @@
                         <a href="${portal}/devices"><img src="${icons}/ic_devices_black_24dp.png" /> Devices</a>
                     </h3>  
                     <h4>View devices covered by this CA for supply chain validation.</h4>
+                    <h3>
+                        <a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a>
+                    </h3>
+                    <h4>View a list of TPM events </h4>
                 </div>
             </div>
         </div>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/tpm-events.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-database.jsp
similarity index 100%
rename from HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/tpm-events.jsp
rename to HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-database.jsp