Merge branch '25.7_fb_ehr_link_crawler' of https://github.com/LabKey/wnprc-modules into 25.7_fb_ehr_link_crawler

Author: labkey-martyp

WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/dataentry/NecropsySchedule.jsp

@@ -28,8 +28,8 @@
 <%--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css">--%>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-3-typeahead/4.0.2/bootstrap3-typeahead.min.js" nonce="<%=getScriptNonce()%>" integrity="sha512-HWlJyU4ut5HkEj0QsK/IxBCY55n5ZpskyjVlAoV9Z7XQwwkqXoYdCIC93/htL3Gu5H3R4an/S0h2NXfbZk3g7w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" nonce="<%=getScriptNonce()%>" integrity="sha512-eYSzo+20ajZMRsjxB6L7eyqo5kuXuS2+wEbbOkpaur+sA2shQameiJiWEzCIDwJqaB0a4a6tCuEvCOBHUg3Skg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js" nonce="<%=getScriptNonce()%>"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.min.js" nonce="<%=getScriptNonce()%>"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js" integrity="sha512-Y+0b10RbVUTf3Mi0EgJue0FoheNzentTMMIE2OreNbqnUPNbQj8zmjK3fs5D2WhQeGWIem2G2UkKjAL/bJ/UXQ==" crossorigin="anonymous" referrerpolicy="no-referrer" nonce="<%=getScriptNonce()%>"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment.min.js" integrity="sha512-vjqLmddiMORo2KKnzvlZ0fMnp7Z8+U+PIzG8h/TLVhZyXpbvdfiaPiZCVtzMIC91TeM5mNKIbTIMMlPAH70uoA==" crossorigin="anonymous" referrerpolicy="no-referrer" nonce="<%=getScriptNonce()%>"></script>
 
 <%
     SimpleQueryFactory queryFactory = new SimpleQueryFactory(getUser(), getContainer());

WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java

@@ -706,12 +706,11 @@ private void addWnprcEHRWebparts()
     {
         log("Add WNPRC EHR Webparts.");
 
-        //enable Page Admin Mode
-        new SiteNavBar(getDriver()).enterPageAdminMode();
-
-        (new PortalHelper(this)).removeAllWebParts();
-        (new PortalHelper(this)).addWebPart("WNPRC Electronic Health Record ");
-        (new PortalHelper(this)).addWebPart("wnprcUnits");
+        new PortalHelper(getDriver()).doInAdminMode(ph -> {
+            ph.removeAllWebParts();
+            ph.addWebPart("WNPRC Electronic Health Record ");
+            ph.addWebPart("wnprcUnits");
+        });
     }
 
     private void addBillingPublicWebParts()
@@ -3485,9 +3484,10 @@ public void updateProgramIncomeAccountWithValidPermissions() throws UnhandledAle
         fillAnInputByName("newCreditToAccountField", "testString");
         click(Locator.tagWithId("button","updateCreditToAccountButton"));
 
-        sleep(2000);
         //Verifies the value has been changed, then continues. If value has not been changed, the test fails here.
-        assertEquals("Updated Program Income Account with invalid permissions.", "testString", Locator.id("ctaCell1").findElement(getDriver()).getText());
+        Awaitility.await().atMost(Duration.ofSeconds(2)).untilAsserted(() -> 
+            assertEquals("Updated Program Income Account with invalid permissions.",
+                "testString", Locator.id("ctaCell1").findElement(getDriver()).getText()));
 
         //Navigates to various containers and removes corresponding permissions.
         stopImpersonating();