From c1ca9b10457bc9eea282af2a588c79faaceb6c4a Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 6 May 2026 13:28:38 -0700
Subject: [PATCH] Update locator for product menu icon links

---
 .../labkey/test/components/ui/navigation/ProductMenu.java    | 4 ++--
 src/org/labkey/test/util/TestDataGenerator.java              | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/org/labkey/test/components/ui/navigation/ProductMenu.java b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
index 4188e6b126..060f0111b5 100644
--- a/src/org/labkey/test/components/ui/navigation/ProductMenu.java
+++ b/src/org/labkey/test/components/ui/navigation/ProductMenu.java
@@ -243,12 +243,12 @@ protected class ElementCache extends Component<?>.ElementCache
         private final WebElement folderColumn = Locator.tagWithClass("div", "col-folders").findWhenNeeded(menuContent);
         private final WebElement sectionContent = Locator.tagWithClass("div", "sections-content").findWhenNeeded(menuContent);
 
-        public Locator.XPathLocator dashboardIconLoc = Locator.tagWithClass("i", "fa-home");
+        public Locator.XPathLocator dashboardIconLoc = Locator.tagWithClass("span", "fa-home");
         public WebElement activeDashboardIcon = Locator.tagWithClass("div", "col-folders")
                 .descendant(Locator.tagWithClass("li", "active"))
                 .descendant(dashboardIconLoc)
                 .findWhenNeeded(menuContent);
-        public Locator.XPathLocator administrationIconLoc = Locator.tagWithClass("i", "fa-gear");
+        public Locator.XPathLocator administrationIconLoc = Locator.tagWithClass("span", "fa-gear");
         public WebElement activeAdministrationIcon = Locator.tagWithClass("div", "col-folders")
                 .descendant(Locator.tagWithClass("li", "active"))
                 .descendant(administrationIconLoc)
diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java
index 7b17d2d5f5..4222e9d75a 100644
--- a/src/org/labkey/test/util/TestDataGenerator.java
+++ b/src/org/labkey/test/util/TestDataGenerator.java
@@ -431,7 +431,10 @@ private Map<String, Object> generateRow()
         final Map<String, Object> newRow = new CaseInsensitiveHashMap<>();
         for (String columnName : _columns.keySet())
         {
-            _dataSuppliers.computeIfAbsent(columnName, k -> getDefaultDataSupplier(_columns.get(k)));
+            if (!_dataSuppliers.containsKey(columnName))
+            {
+                _dataSuppliers.put(columnName, getDefaultDataSupplier(_columns.get(columnName)));
+            }
 
             if (_autoGeneratedFields.contains(columnName))
             {