Wait for panel visibility in ShowAdminPage (#2620)

labkey-tchad · web-flow · commit ffd5c3d5e7bd · 2025-08-11T15:47:22.000-07:00
diff --git a/src/org/labkey/test/pages/ConfigureReportsAndScriptsPage.java b/src/org/labkey/test/pages/ConfigureReportsAndScriptsPage.java
@@ -27,6 +27,7 @@
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.LoggedParam;
 import org.labkey.test.util.TestLogger;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 import java.io.File;
@@ -45,7 +46,7 @@ public class ConfigureReportsAndScriptsPage extends LabKeyPage
     private static final String DEFAULT_ENGINE = "Mozilla Rhino";
     private static final String EDIT_WINDOW_TITLE = "Edit Engine Configuration";
 
-    public ConfigureReportsAndScriptsPage(WebDriverWrapper test)
+    public ConfigureReportsAndScriptsPage(WebDriver test)
     {
         super(test);
         waitForEnginesGrid();
@@ -54,7 +55,7 @@ public ConfigureReportsAndScriptsPage(WebDriverWrapper test)
     public static ConfigureReportsAndScriptsPage beginAt(WebDriverWrapper driver)
     {
         driver.beginAt(WebTestHelper.buildURL("core", "configureReportsAndScripts"));
-        return new ConfigureReportsAndScriptsPage(driver);
+        return new ConfigureReportsAndScriptsPage(driver.getDriver());
     }
 
     public void waitForEnginesGrid()
diff --git a/src/org/labkey/test/pages/core/admin/ShowAdminPage.java b/src/org/labkey/test/pages/core/admin/ShowAdminPage.java
@@ -28,10 +28,11 @@
 import org.labkey.test.util.OptionalFeatureHelper;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.util.List;
+import java.util.function.Function;
 
-// TODO: Missing lots of functionality
 public class ShowAdminPage extends LabKeyPage<ShowAdminPage.ElementCache>
 {
     public ShowAdminPage(WebDriver driver)
@@ -48,104 +49,105 @@ public static ShowAdminPage beginAt(WebDriverWrapper driver)
     public ShowAdminPage goToServerInformationSection()
     {
         elementCache().sectionServerInfo.click();
+        shortWait().until(ExpectedConditions.visibilityOf(elementCache().serverInfoPanel));
         return this;
     }
 
     public ShowAdminPage goToSettingsSection()
     {
         elementCache().sectionSettingsLinks.click();
+        shortWait().until(ExpectedConditions.visibilityOf(elementCache().settingsPanel));
         return this;
     }
 
     public ShowAdminPage goToModuleInformationSection()
     {
         elementCache().sectionModuleInfo.click();
+        shortWait().until(ExpectedConditions.visibilityOf(elementCache().moduleInfoPanel));
         return this;
     }
 
-    public ShowAdminPage goToActiveUsersSection()
+    public ShowAdminPage goToRecentUsersSection()
     {
         elementCache().sectionActiveUsers.click();
+        shortWait().until(ExpectedConditions.visibilityOf(elementCache().recentUsersPanel));
         return this;
     }
 
-    public List<String> getActiveUsers()
+    public void clickSettingsLink(String settingsLink)
     {
-        goToActiveUsersSection();
-        return getTexts(elementCache().findActiveUsers());
+        goToSettingsSection();
+        clickAndWait(Locator.linkWithText(settingsLink).findElement(elementCache().settingsPanel));
+    }
+
+    public <T> T clickSettingsLink(String settingsLink, Function<WebDriver, T> pageFactory)
+    {
+        clickSettingsLink(settingsLink);
+        return pageFactory.apply(getDriver());
+    }
+
+    public List<String> getRecentUsers()
+    {
+        goToRecentUsersSection();
+        return getTexts(elementCache().findRecentUsers());
     }
 
     public String getServerGUID()
     {
         goToServerInformationSection();
-        return elementCache().findServerGUID().getText();
+        return elementCache().serverGuidEl.getText();
     }
 
     public void clickAnalyticsSettings()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().analyticsSettingsLink);
+        clickSettingsLink("analytics settings");
     }
 
     public void clickAllowedExternalRedirectHosts()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().externalRedirectHostLink);
+        clickSettingsLink("allowed external redirect hosts");
         Locator.waitForAnyElement(shortWait(), Locator.tagWithText("span", "Done"), Locator.tagWithText("span", "Save"));
     }
 
     public ShowAuditLogPage clickAuditLog()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().auditLogLink);
-        return new ShowAuditLogPage(getDriver());
+        return clickSettingsLink("audit log", ShowAuditLogPage::new);
     }
 
     public ExternalSourcesPage clickAllowedExternalResourceHosts()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().externalResourceHostsLink);
-        return new ExternalSourcesPage(getDriver());
+        return clickSettingsLink("allowed external resource hosts", ExternalSourcesPage::new);
     }
 
     public AllowedFileExtensionAdminPage clickAllowedFileExtensions()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().allowedFileExtensionLink);
-        return new AllowedFileExtensionAdminPage(getDriver());
+        return clickSettingsLink("allowed file extensions", AllowedFileExtensionAdminPage::new);
     }
 
     public void clickAuditLogMaintenance()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().auditLogMaintenanceLink);
+        clickSettingsLink("Audit Log Maintenance");
     }
+
     public LoginConfigurePage clickAuthentication()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().authenticationLink);
-        return new LoginConfigurePage(getDriver());
+        return clickSettingsLink("authentication", LoginConfigurePage::new);
     }
 
     public void clickConfigurePageElements()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().configurePageElements);
+        clickSettingsLink("configure page elements");
         Locator.waitForAnyElement(shortWait(), Locator.tagWithText("span", "Done"), Locator.tagWithText("span", "Save"));
     }
 
     public ComplianceSettingsAccountsPage clickComplianceSettings()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().complianceSettings);
-        return new ComplianceSettingsAccountsPage(getDriver());
+        return clickSettingsLink("Compliance Settings", ComplianceSettingsAccountsPage::new);
     }
 
     public DomainDesignerPage clickChangeUserProperties()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().changeUserPropertiesLink);
-        return new DomainDesignerPage(getDriver());
+        return clickSettingsLink("change user properties", DomainDesignerPage::new);
     }
 
     public void clickDeprecatedFeatures()
@@ -156,130 +158,103 @@ public void clickDeprecatedFeatures()
 
     public void clickEmailCustomization()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().emailCustomizationLink);
+        clickSettingsLink("email customization");
     }
 
     public void clickNotificationServiceAdmin()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().notificationServiceAdminLink);
+        clickSettingsLink("notification service admin");
     }
 
     public ConfigureFileSystemAccessPage clickFiles()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().filesLink);
-        return new ConfigureFileSystemAccessPage(getDriver());
+        return clickSettingsLink("files", ConfigureFileSystemAccessPage::new);
     }
 
     public void clickFullTextSearch()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().fullTextSearchLink);
+        clickSettingsLink("full-text search");
     }
 
     public FolderTypePages clickFolderType()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().folderTypeLink);
-        return new FolderTypePages(getDriver());
+        return clickSettingsLink("folder types", FolderTypePages::new);
     }
 
     public SiteValidationPage clickSiteValidation()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().siteValidationLink);
-        return new SiteValidationPage(getDriver());
+        return clickSettingsLink("site validation", SiteValidationPage::new);
     }
 
     public LookAndFeelSettingsPage clickLookAndFeelSettings()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().lookAndFeelSettingsLink);
-        return new LookAndFeelSettingsPage(getDriver());
+        return clickSettingsLink("look and feel settings", LookAndFeelSettingsPage::new);
     }
 
     public void clickMasterPatientIndex()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().masterPatientIndex);
+        clickSettingsLink("Master Patient Index");
     }
 
     public void clickProfiler()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().profilerLink);
+        clickSettingsLink("profiler");
     }
 
     public void clickRunningThreads()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().runningThreadsLink);
+        clickSettingsLink("running threads");
     }
 
     public CustomizeSitePage clickSiteSettings()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().siteSettingsLink);
-        return new CustomizeSitePage(getDriver());
+        return clickSettingsLink("site settings", CustomizeSitePage::new);
     }
 
     public void clickSiteWideTerms()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().siteWideTermsLink);
+        clickSettingsLink("site-wide terms of use");
     }
 
     public ConfigureSystemMaintenancePage clickSystemMaintenance()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().systemMaintenanceLink);
-        return new ConfigureSystemMaintenancePage(getDriver());
+        return clickSettingsLink("system maintenance", ConfigureSystemMaintenancePage::new);
     }
 
     public void clickSystemProperties()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().systemPropertiesLink);
+        clickSettingsLink("system properties");
     }
 
     public ConfigureReportsAndScriptsPage clickViewsAndScripting()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().viewsAndScriptingLink);
-        return new ConfigureReportsAndScriptsPage(this);
+        return clickSettingsLink("views and scripting", ConfigureReportsAndScriptsPage::new);
     }
 
     public void clickCredits()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().creditsLink);
+        clickSettingsLink("credits");
     }
 
     public void clickViewPrimarySiteLogFile()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().viewPrimarySiteLogFileLink);
+        clickSettingsLink("view primary site log file");
     }
 
     public void clickPostgresActivity()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().postgresActivityLink);
+        clickSettingsLink("postgres activity");
     }
 
     public void clickPostgresLocks()
     {
-        goToSettingsSection();
-        clickAndWait(elementCache().postgresLocksLink);
+        clickSettingsLink("postgres locks");
     }
 
     public List<WebElement> getAllAdminConsoleLinks()
     {
         goToSettingsSection();
-        WebElement adminLinksContainer = Locator.id("links").findElement(getDriver());
-        return Locator.tag("a").findElements(adminLinksContainer);
+        return Locator.tag("a").findElements(elementCache().settingsPanel);
     }
 
     @Override
@@ -288,52 +263,24 @@ protected ElementCache newElementCache()
         return new ElementCache();
     }
 
-    protected class ElementCache extends LabKeyPage<?>.ElementCache
-    {
-        protected WebElement sectionServerInfo = Locator.linkWithText("Server Information").findWhenNeeded(this);
-        protected WebElement sectionSettingsLinks = Locator.linkWithText("Settings").findWhenNeeded(this);
-        protected WebElement sectionModuleInfo = Locator.linkWithText("Module Information").findWhenNeeded(this);
-        protected WebElement sectionActiveUsers = Locator.linkWithText("Active Users").findWhenNeeded(this);
-
-        protected WebElement analyticsSettingsLink = Locator.linkWithText("analytics settings").findWhenNeeded(this);
-        protected WebElement externalRedirectHostLink = Locator.linkWithText("allowed external redirect hosts").findWhenNeeded(this);
-        protected WebElement externalResourceHostsLink = Locator.linkWithText("allowed external resource hosts").findWhenNeeded(this);
-        protected WebElement allowedFileExtensionLink = Locator.linkWithText("allowed file extensions").findWhenNeeded(this);
-        protected WebElement auditLogLink = Locator.linkWithText("audit log").findWhenNeeded(this);
-        protected WebElement auditLogMaintenanceLink = Locator.linkWithText("Audit Log Maintenance").findWhenNeeded(this);
-        protected WebElement authenticationLink = Locator.linkWithText("authentication").findWhenNeeded(this);
-        protected WebElement configurePageElements = Locator.linkWithText("configure page elements").findWhenNeeded(this);
-        protected WebElement complianceSettings = Locator.linkWithText("Compliance Settings").findWhenNeeded(this);
-        protected WebElement changeUserPropertiesLink = Locator.linkWithText("change user properties").findWhenNeeded(this);
-        protected WebElement emailCustomizationLink = Locator.linkWithText("email customization").findWhenNeeded(this);
-        protected WebElement notificationServiceAdminLink = Locator.linkWithText("notification service admin").findWhenNeeded(this);
-        protected WebElement filesLink = Locator.linkWithText("files").findWhenNeeded(this);
-        protected WebElement fullTextSearchLink = Locator.linkWithText("full-text search").findWhenNeeded(this);
-        protected WebElement folderTypeLink = Locator.linkWithText("folder types").findWhenNeeded(this);
-        protected WebElement siteValidationLink = Locator.linkWithText("site validation").findWhenNeeded(this);
-        protected WebElement lookAndFeelSettingsLink = Locator.linkWithText("look and feel settings").findWhenNeeded(this);
-        protected WebElement masterPatientIndex = Locator.linkWithText("Master Patient Index").findWhenNeeded(this);
-        protected WebElement profilerLink = Locator.linkWithText("profiler").findWhenNeeded(this);
-        protected WebElement runningThreadsLink = Locator.linkWithText("running threads").findWhenNeeded(this);
-        protected WebElement siteSettingsLink = Locator.linkWithText("site settings").findWhenNeeded(this);
-        protected WebElement siteWideTermsLink = Locator.linkContainingText("site-wide terms of use").findWhenNeeded(this);
-        protected WebElement systemMaintenanceLink = Locator.linkWithText("system maintenance").findWhenNeeded(this);
-        protected WebElement systemPropertiesLink = Locator.linkContainingText("system properties").findWhenNeeded(this);
-        protected WebElement viewsAndScriptingLink = Locator.linkWithText("views and scripting").findWhenNeeded(this);
-        protected WebElement creditsLink = Locator.linkWithText("credits").findWhenNeeded(this);
-        protected WebElement viewPrimarySiteLogFileLink = Locator.linkWithText("view primary site log file").findWhenNeeded(this);
-
-        protected WebElement postgresActivityLink = Locator.linkWithText("postgres activity").findWhenNeeded(this);
-        protected WebElement postgresLocksLink = Locator.linkWithText("postgres locks").findWhenNeeded(this);
-
-        protected List<WebElement> findActiveUsers()
-        {
-            return Locator.tagWithName("table", "activeUsers").append(Locator.tag("td").position(1)).findElements(this);
-        }
+    protected class ElementCache extends LabKeyPage<ShowAdminPage.ElementCache>.ElementCache
+    {
+        private final WebElement adminNavPanel = Locator.id("lk-admin-nav").findWhenNeeded(this);
+        private final WebElement sectionServerInfo = Locator.linkWithText("Server Information").findWhenNeeded(adminNavPanel);
+        private final WebElement sectionSettingsLinks = Locator.linkWithText("Settings").findWhenNeeded(adminNavPanel);
+        private final WebElement sectionModuleInfo = Locator.linkWithText("Module Information").findWhenNeeded(adminNavPanel);
+        private final WebElement sectionActiveUsers = Locator.linkWithText("Active Users").findWhenNeeded(adminNavPanel);
 
-        protected WebElement findServerGUID()
+        private final WebElement serverInfoPanel = Locator.id("info").withClass("lk-admin-section").findWhenNeeded(this);
+        private final WebElement settingsPanel = Locator.id("links").withClass("lk-admin-section").findWhenNeeded(this);
+        private final WebElement moduleInfoPanel = Locator.id("modules").withClass("lk-admin-section").findWhenNeeded(this);
+        private final WebElement recentUsersPanel = Locator.id("users").withClass("lk-admin-section").findWhenNeeded(this);
+
+        private List<WebElement> findRecentUsers()
         {
-            return Locator.tagWithText("td", "Server GUID").followingSibling("td").findElement(this);
+            return Locator.tagWithName("table", "activeUsers").append(Locator.tag("td").position(1)).findElements(recentUsersPanel);
         }
+
+        private final WebElement serverGuidEl =  Locator.tagWithText("td", "Server GUID").followingSibling("td").findWhenNeeded(serverInfoPanel);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@`
`28`	`28`	`import org.labkey.test.util.OptionalFeatureHelper;`
`29`	`29`	`import org.openqa.selenium.WebDriver;`
`30`	`30`	`import org.openqa.selenium.WebElement;`
	`31`	`+import org.openqa.selenium.support.ui.ExpectedConditions;`
`31`	`32`
`32`	`33`	`import java.util.List;`
	`34`	`+import java.util.function.Function;`
`33`	`35`
`34`		`-// TODO: Missing lots of functionality`
`35`	`36`	`public class ShowAdminPage extends LabKeyPage<ShowAdminPage.ElementCache>`
`36`	`37`	`{`
`37`	`38`	`public ShowAdminPage(WebDriver driver)`
`@@ -48,104 +49,105 @@ public static ShowAdminPage beginAt(WebDriverWrapper driver)`
`48`	`49`	`public ShowAdminPage goToServerInformationSection()`
`49`	`50`	`{`
`50`	`51`	`elementCache().sectionServerInfo.click();`
	`52`	`+ shortWait().until(ExpectedConditions.visibilityOf(elementCache().serverInfoPanel));`
`51`	`53`	`return this;`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`public ShowAdminPage goToSettingsSection()`
`55`	`57`	`{`
`56`	`58`	`elementCache().sectionSettingsLinks.click();`
	`59`	`+ shortWait().until(ExpectedConditions.visibilityOf(elementCache().settingsPanel));`
`57`	`60`	`return this;`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`public ShowAdminPage goToModuleInformationSection()`
`61`	`64`	`{`
`62`	`65`	`elementCache().sectionModuleInfo.click();`
	`66`	`+ shortWait().until(ExpectedConditions.visibilityOf(elementCache().moduleInfoPanel));`
`63`	`67`	`return this;`
`64`	`68`	`}`
`65`	`69`
`66`		`- public ShowAdminPage goToActiveUsersSection()`
	`70`	`+ public ShowAdminPage goToRecentUsersSection()`
`67`	`71`	`{`
`68`	`72`	`elementCache().sectionActiveUsers.click();`
	`73`	`+ shortWait().until(ExpectedConditions.visibilityOf(elementCache().recentUsersPanel));`
`69`	`74`	`return this;`
`70`	`75`	`}`
`71`	`76`
`72`		`- public List<String> getActiveUsers()`
	`77`	`+ public void clickSettingsLink(String settingsLink)`
`73`	`78`	`{`
`74`		`- goToActiveUsersSection();`
`75`		`- return getTexts(elementCache().findActiveUsers());`
	`79`	`+ goToSettingsSection();`
	`80`	`+ clickAndWait(Locator.linkWithText(settingsLink).findElement(elementCache().settingsPanel));`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ public <T> T clickSettingsLink(String settingsLink, Function<WebDriver, T> pageFactory)`
	`84`	`+ {`
	`85`	`+ clickSettingsLink(settingsLink);`
	`86`	`+ return pageFactory.apply(getDriver());`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ public List<String> getRecentUsers()`
	`90`	`+ {`
	`91`	`+ goToRecentUsersSection();`
	`92`	`+ return getTexts(elementCache().findRecentUsers());`
`76`	`93`	`}`
`77`	`94`
`78`	`95`	`public String getServerGUID()`
`79`	`96`	`{`
`80`	`97`	`goToServerInformationSection();`
`81`		`- return elementCache().findServerGUID().getText();`
	`98`	`+ return elementCache().serverGuidEl.getText();`
`82`	`99`	`}`
`83`	`100`
`84`	`101`	`public void clickAnalyticsSettings()`
`85`	`102`	`{`
`86`		`- goToSettingsSection();`
`87`		`- clickAndWait(elementCache().analyticsSettingsLink);`
	`103`	`+ clickSettingsLink("analytics settings");`
`88`	`104`	`}`
`89`	`105`
`90`	`106`	`public void clickAllowedExternalRedirectHosts()`
`91`	`107`	`{`
`92`		`- goToSettingsSection();`
`93`		`- clickAndWait(elementCache().externalRedirectHostLink);`
	`108`	`+ clickSettingsLink("allowed external redirect hosts");`
`94`	`109`	`Locator.waitForAnyElement(shortWait(), Locator.tagWithText("span", "Done"), Locator.tagWithText("span", "Save"));`
`95`	`110`	`}`
`96`	`111`
`97`	`112`	`public ShowAuditLogPage clickAuditLog()`
`98`	`113`	`{`
`99`		`- goToSettingsSection();`
`100`		`- clickAndWait(elementCache().auditLogLink);`
`101`		`- return new ShowAuditLogPage(getDriver());`
	`114`	`+ return clickSettingsLink("audit log", ShowAuditLogPage::new);`
`102`	`115`	`}`
`103`	`116`
`104`	`117`	`public ExternalSourcesPage clickAllowedExternalResourceHosts()`
`105`	`118`	`{`
`106`		`- goToSettingsSection();`
`107`		`- clickAndWait(elementCache().externalResourceHostsLink);`
`108`		`- return new ExternalSourcesPage(getDriver());`
	`119`	`+ return clickSettingsLink("allowed external resource hosts", ExternalSourcesPage::new);`
`109`	`120`	`}`
`110`	`121`
`111`	`122`	`public AllowedFileExtensionAdminPage clickAllowedFileExtensions()`
`112`	`123`	`{`
`113`		`- goToSettingsSection();`
`114`		`- clickAndWait(elementCache().allowedFileExtensionLink);`
`115`		`- return new AllowedFileExtensionAdminPage(getDriver());`
	`124`	`+ return clickSettingsLink("allowed file extensions", AllowedFileExtensionAdminPage::new);`
`116`	`125`	`}`
`117`	`126`
`118`	`127`	`public void clickAuditLogMaintenance()`
`119`	`128`	`{`
`120`		`- goToSettingsSection();`
`121`		`- clickAndWait(elementCache().auditLogMaintenanceLink);`
	`129`	`+ clickSettingsLink("Audit Log Maintenance");`
`122`	`130`	`}`
	`131`	`+`
`123`	`132`	`public LoginConfigurePage clickAuthentication()`
`124`	`133`	`{`
`125`		`- goToSettingsSection();`
`126`		`- clickAndWait(elementCache().authenticationLink);`
`127`		`- return new LoginConfigurePage(getDriver());`
	`134`	`+ return clickSettingsLink("authentication", LoginConfigurePage::new);`
`128`	`135`	`}`
`129`	`136`
`130`	`137`	`public void clickConfigurePageElements()`
`131`	`138`	`{`
`132`		`- goToSettingsSection();`
`133`		`- clickAndWait(elementCache().configurePageElements);`
	`139`	`+ clickSettingsLink("configure page elements");`
`134`	`140`	`Locator.waitForAnyElement(shortWait(), Locator.tagWithText("span", "Done"), Locator.tagWithText("span", "Save"));`
`135`	`141`	`}`
`136`	`142`
`137`	`143`	`public ComplianceSettingsAccountsPage clickComplianceSettings()`
`138`	`144`	`{`
`139`		`- goToSettingsSection();`
`140`		`- clickAndWait(elementCache().complianceSettings);`
`141`		`- return new ComplianceSettingsAccountsPage(getDriver());`
	`145`	`+ return clickSettingsLink("Compliance Settings", ComplianceSettingsAccountsPage::new);`
`142`	`146`	`}`
`143`	`147`
`144`	`148`	`public DomainDesignerPage clickChangeUserProperties()`
`145`	`149`	`{`
`146`		`- goToSettingsSection();`
`147`		`- clickAndWait(elementCache().changeUserPropertiesLink);`
`148`		`- return new DomainDesignerPage(getDriver());`
	`150`	`+ return clickSettingsLink("change user properties", DomainDesignerPage::new);`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`public void clickDeprecatedFeatures()`
`@@ -156,130 +158,103 @@ public void clickDeprecatedFeatures()`
`156`	`158`
`157`	`159`	`public void clickEmailCustomization()`
`158`	`160`	`{`
`159`		`- goToSettingsSection();`
`160`		`- clickAndWait(elementCache().emailCustomizationLink);`
	`161`	`+ clickSettingsLink("email customization");`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`public void clickNotificationServiceAdmin()`
`164`	`165`	`{`
`165`		`- goToSettingsSection();`
`166`		`- clickAndWait(elementCache().notificationServiceAdminLink);`
	`166`	`+ clickSettingsLink("notification service admin");`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`public ConfigureFileSystemAccessPage clickFiles()`
`170`	`170`	`{`
`171`		`- goToSettingsSection();`
`172`		`- clickAndWait(elementCache().filesLink);`
`173`		`- return new ConfigureFileSystemAccessPage(getDriver());`
	`171`	`+ return clickSettingsLink("files", ConfigureFileSystemAccessPage::new);`
`174`	`172`	`}`
`175`	`173`
`176`	`174`	`public void clickFullTextSearch()`
`177`	`175`	`{`
`178`		`- goToSettingsSection();`
`179`		`- clickAndWait(elementCache().fullTextSearchLink);`
	`176`	`+ clickSettingsLink("full-text search");`
`180`	`177`	`}`
`181`	`178`
`182`	`179`	`public FolderTypePages clickFolderType()`
`183`	`180`	`{`
`184`		`- goToSettingsSection();`
`185`		`- clickAndWait(elementCache().folderTypeLink);`
`186`		`- return new FolderTypePages(getDriver());`
	`181`	`+ return clickSettingsLink("folder types", FolderTypePages::new);`
`187`	`182`	`}`
`188`	`183`
`189`	`184`	`public SiteValidationPage clickSiteValidation()`
`190`	`185`	`{`
`191`		`- goToSettingsSection();`
`192`		`- clickAndWait(elementCache().siteValidationLink);`
`193`		`- return new SiteValidationPage(getDriver());`
	`186`	`+ return clickSettingsLink("site validation", SiteValidationPage::new);`
`194`	`187`	`}`
`195`	`188`
`196`	`189`	`public LookAndFeelSettingsPage clickLookAndFeelSettings()`
`197`	`190`	`{`
`198`		`- goToSettingsSection();`
`199`		`- clickAndWait(elementCache().lookAndFeelSettingsLink);`
`200`		`- return new LookAndFeelSettingsPage(getDriver());`
	`191`	`+ return clickSettingsLink("look and feel settings", LookAndFeelSettingsPage::new);`
`201`	`192`	`}`
`202`	`193`
`203`	`194`	`public void clickMasterPatientIndex()`
`204`	`195`	`{`
`205`		`- goToSettingsSection();`
`206`		`- clickAndWait(elementCache().masterPatientIndex);`
	`196`	`+ clickSettingsLink("Master Patient Index");`
`207`	`197`	`}`
`208`	`198`
`209`	`199`	`public void clickProfiler()`
`210`	`200`	`{`
`211`		`- goToSettingsSection();`
`212`		`- clickAndWait(elementCache().profilerLink);`
	`201`	`+ clickSettingsLink("profiler");`
`213`	`202`	`}`
`214`	`203`
`215`	`204`	`public void clickRunningThreads()`
`216`	`205`	`{`
`217`		`- goToSettingsSection();`
`218`		`- clickAndWait(elementCache().runningThreadsLink);`
	`206`	`+ clickSettingsLink("running threads");`
`219`	`207`	`}`
`220`	`208`
`221`	`209`	`public CustomizeSitePage clickSiteSettings()`
`222`	`210`	`{`
`223`		`- goToSettingsSection();`
`224`		`- clickAndWait(elementCache().siteSettingsLink);`
`225`		`- return new CustomizeSitePage(getDriver());`
	`211`	`+ return clickSettingsLink("site settings", CustomizeSitePage::new);`
`226`	`212`	`}`
`227`	`213`
`228`	`214`	`public void clickSiteWideTerms()`
`229`	`215`	`{`
`230`		`- goToSettingsSection();`
`231`		`- clickAndWait(elementCache().siteWideTermsLink);`
	`216`	`+ clickSettingsLink("site-wide terms of use");`
`232`	`217`	`}`
`233`	`218`
`234`	`219`	`public ConfigureSystemMaintenancePage clickSystemMaintenance()`
`235`	`220`	`{`
`236`		`- goToSettingsSection();`
`237`		`- clickAndWait(elementCache().systemMaintenanceLink);`
`238`		`- return new ConfigureSystemMaintenancePage(getDriver());`
	`221`	`+ return clickSettingsLink("system maintenance", ConfigureSystemMaintenancePage::new);`
`239`	`222`	`}`
`240`	`223`
`241`	`224`	`public void clickSystemProperties()`
`242`	`225`	`{`
`243`		`- goToSettingsSection();`
`244`		`- clickAndWait(elementCache().systemPropertiesLink);`
	`226`	`+ clickSettingsLink("system properties");`
`245`	`227`	`}`
`246`	`228`
`247`	`229`	`public ConfigureReportsAndScriptsPage clickViewsAndScripting()`
`248`	`230`	`{`
`249`		`- goToSettingsSection();`
`250`		`- clickAndWait(elementCache().viewsAndScriptingLink);`
`251`		`- return new ConfigureReportsAndScriptsPage(this);`
	`231`	`+ return clickSettingsLink("views and scripting", ConfigureReportsAndScriptsPage::new);`
`252`	`232`	`}`
`253`	`233`
`254`	`234`	`public void clickCredits()`
`255`	`235`	`{`
`256`		`- goToSettingsSection();`
`257`		`- clickAndWait(elementCache().creditsLink);`
	`236`	`+ clickSettingsLink("credits");`
`258`	`237`	`}`
`259`	`238`
`260`	`239`	`public void clickViewPrimarySiteLogFile()`
`261`	`240`	`{`
`262`		`- goToSettingsSection();`
`263`		`- clickAndWait(elementCache().viewPrimarySiteLogFileLink);`
	`241`	`+ clickSettingsLink("view primary site log file");`
`264`	`242`	`}`
`265`	`243`
`266`	`244`	`public void clickPostgresActivity()`
`267`	`245`	`{`
`268`		`- goToSettingsSection();`
`269`		`- clickAndWait(elementCache().postgresActivityLink);`
	`246`	`+ clickSettingsLink("postgres activity");`
`270`	`247`	`}`
`271`	`248`
`272`	`249`	`public void clickPostgresLocks()`
`273`	`250`	`{`
`274`		`- goToSettingsSection();`
`275`		`- clickAndWait(elementCache().postgresLocksLink);`
	`251`	`+ clickSettingsLink("postgres locks");`
`276`	`252`	`}`
`277`	`253`
`278`	`254`	`public List<WebElement> getAllAdminConsoleLinks()`
`279`	`255`	`{`
`280`	`256`	`goToSettingsSection();`
`281`		`- WebElement adminLinksContainer = Locator.id("links").findElement(getDriver());`
`282`		`- return Locator.tag("a").findElements(adminLinksContainer);`
	`257`	`+ return Locator.tag("a").findElements(elementCache().settingsPanel);`
`283`	`258`	`}`
`284`	`259`
`285`	`260`	`@Override`
`@@ -288,52 +263,24 @@ protected ElementCache newElementCache()`
`288`	`263`	`return new ElementCache();`
`289`	`264`	`}`
`290`	`265`
`291`		`- protected class ElementCache extends LabKeyPage<?>.ElementCache`
`292`		`- {`
`293`		`- protected WebElement sectionServerInfo = Locator.linkWithText("Server Information").findWhenNeeded(this);`
`294`		`- protected WebElement sectionSettingsLinks = Locator.linkWithText("Settings").findWhenNeeded(this);`
`295`		`- protected WebElement sectionModuleInfo = Locator.linkWithText("Module Information").findWhenNeeded(this);`
`296`		`- protected WebElement sectionActiveUsers = Locator.linkWithText("Active Users").findWhenNeeded(this);`
`297`		`-`
`298`		`- protected WebElement analyticsSettingsLink = Locator.linkWithText("analytics settings").findWhenNeeded(this);`
`299`		`- protected WebElement externalRedirectHostLink = Locator.linkWithText("allowed external redirect hosts").findWhenNeeded(this);`
`300`		`- protected WebElement externalResourceHostsLink = Locator.linkWithText("allowed external resource hosts").findWhenNeeded(this);`
`301`		`- protected WebElement allowedFileExtensionLink = Locator.linkWithText("allowed file extensions").findWhenNeeded(this);`
`302`		`- protected WebElement auditLogLink = Locator.linkWithText("audit log").findWhenNeeded(this);`
`303`		`- protected WebElement auditLogMaintenanceLink = Locator.linkWithText("Audit Log Maintenance").findWhenNeeded(this);`
`304`		`- protected WebElement authenticationLink = Locator.linkWithText("authentication").findWhenNeeded(this);`
`305`		`- protected WebElement configurePageElements = Locator.linkWithText("configure page elements").findWhenNeeded(this);`
`306`		`- protected WebElement complianceSettings = Locator.linkWithText("Compliance Settings").findWhenNeeded(this);`
`307`		`- protected WebElement changeUserPropertiesLink = Locator.linkWithText("change user properties").findWhenNeeded(this);`
`308`		`- protected WebElement emailCustomizationLink = Locator.linkWithText("email customization").findWhenNeeded(this);`
`309`		`- protected WebElement notificationServiceAdminLink = Locator.linkWithText("notification service admin").findWhenNeeded(this);`
`310`		`- protected WebElement filesLink = Locator.linkWithText("files").findWhenNeeded(this);`
`311`		`- protected WebElement fullTextSearchLink = Locator.linkWithText("full-text search").findWhenNeeded(this);`
`312`		`- protected WebElement folderTypeLink = Locator.linkWithText("folder types").findWhenNeeded(this);`
`313`		`- protected WebElement siteValidationLink = Locator.linkWithText("site validation").findWhenNeeded(this);`
`314`		`- protected WebElement lookAndFeelSettingsLink = Locator.linkWithText("look and feel settings").findWhenNeeded(this);`
`315`		`- protected WebElement masterPatientIndex = Locator.linkWithText("Master Patient Index").findWhenNeeded(this);`
`316`		`- protected WebElement profilerLink = Locator.linkWithText("profiler").findWhenNeeded(this);`
`317`		`- protected WebElement runningThreadsLink = Locator.linkWithText("running threads").findWhenNeeded(this);`
`318`		`- protected WebElement siteSettingsLink = Locator.linkWithText("site settings").findWhenNeeded(this);`
`319`		`- protected WebElement siteWideTermsLink = Locator.linkContainingText("site-wide terms of use").findWhenNeeded(this);`
`320`		`- protected WebElement systemMaintenanceLink = Locator.linkWithText("system maintenance").findWhenNeeded(this);`
`321`		`- protected WebElement systemPropertiesLink = Locator.linkContainingText("system properties").findWhenNeeded(this);`
`322`		`- protected WebElement viewsAndScriptingLink = Locator.linkWithText("views and scripting").findWhenNeeded(this);`
`323`		`- protected WebElement creditsLink = Locator.linkWithText("credits").findWhenNeeded(this);`
`324`		`- protected WebElement viewPrimarySiteLogFileLink = Locator.linkWithText("view primary site log file").findWhenNeeded(this);`
`325`		`-`
`326`		`- protected WebElement postgresActivityLink = Locator.linkWithText("postgres activity").findWhenNeeded(this);`
`327`		`- protected WebElement postgresLocksLink = Locator.linkWithText("postgres locks").findWhenNeeded(this);`
`328`		`-`
`329`		`- protected List<WebElement> findActiveUsers()`
`330`		`- {`
`331`		`- return Locator.tagWithName("table", "activeUsers").append(Locator.tag("td").position(1)).findElements(this);`
`332`		`- }`
	`266`	`+ protected class ElementCache extends LabKeyPage<ShowAdminPage.ElementCache>.ElementCache`
	`267`	`+ {`
	`268`	`+ private final WebElement adminNavPanel = Locator.id("lk-admin-nav").findWhenNeeded(this);`
	`269`	`+ private final WebElement sectionServerInfo = Locator.linkWithText("Server Information").findWhenNeeded(adminNavPanel);`
	`270`	`+ private final WebElement sectionSettingsLinks = Locator.linkWithText("Settings").findWhenNeeded(adminNavPanel);`
	`271`	`+ private final WebElement sectionModuleInfo = Locator.linkWithText("Module Information").findWhenNeeded(adminNavPanel);`
	`272`	`+ private final WebElement sectionActiveUsers = Locator.linkWithText("Active Users").findWhenNeeded(adminNavPanel);`
`333`	`273`
`334`		`- protected WebElement findServerGUID()`
	`274`	`+ private final WebElement serverInfoPanel = Locator.id("info").withClass("lk-admin-section").findWhenNeeded(this);`
	`275`	`+ private final WebElement settingsPanel = Locator.id("links").withClass("lk-admin-section").findWhenNeeded(this);`
	`276`	`+ private final WebElement moduleInfoPanel = Locator.id("modules").withClass("lk-admin-section").findWhenNeeded(this);`
	`277`	`+ private final WebElement recentUsersPanel = Locator.id("users").withClass("lk-admin-section").findWhenNeeded(this);`
	`278`	`+`
	`279`	`+ private List<WebElement> findRecentUsers()`
`335`	`280`	`{`
`336`		`- return Locator.tagWithText("td", "Server GUID").followingSibling("td").findElement(this);`
	`281`	`+ return Locator.tagWithName("table", "activeUsers").append(Locator.tag("td").position(1)).findElements(recentUsersPanel);`
`337`	`282`	`}`
	`283`	`+`
	`284`	`+ private final WebElement serverGuidEl = Locator.tagWithText("td", "Server GUID").followingSibling("td").findWhenNeeded(serverInfoPanel);`
`338`	`285`	`}`
`339`	`286`	`}`