Merge 25.7 to develop

Author: labkey-teamcity

data/api/security-api.xml

@@ -1,7 +1,7 @@
 <ApiTests xmlns="http://labkey.org/query/xml">
 
     <test name="get group permissions" type="get">
-        <url>Security%20API%20Test%20Project/security-getGroupPerms.view?</url>
+        <url>Security%20API%20Test%20Project/security-getGroupPerms.api</url>
         <response>
             {"container":
                 {
@@ -93,8 +93,71 @@
         </response>
     </test>
 
+    <test name="get group permissions excluding groups without effective permissions" type="get">
+        <url>Security%20API%20Test%20Project/security-getGroupPerms.api?includeEmptyPermGroups=false</url>
+        <response>
+            {"container":
+                {
+                    "id": "THIS CONTAINER GUID FIELD IS IGNORED IN JSON CHECK",
+                    "name": "Security API Test Project",
+                    "path": "/Security API Test Project",
+                    "isInheritingPerms": false,
+                    "groups": [
+                        {
+                            "id": 1672,
+                            "name": "testgroup1",
+                            "roles": ["org.labkey.api.security.roles.EditorRole"],
+                            "isSystemGroup": false,
+                            "isProjectGroup": true,
+                            "type": "g",
+                            "effectivePermissions": [
+                                "org.labkey.api.security.permissions.InsertPermission",
+                                "org.labkey.api.security.permissions.DeletePermission",
+                                "org.labkey.api.security.permissions.EditSharedViewPermission",
+                                "org.labkey.api.reports.permissions.EditSharedReportPermission",
+                                "org.labkey.api.security.permissions.ReadPermission",
+                                "org.labkey.api.reports.permissions.ShareReportPermission",
+                                "org.labkey.api.study.permissions.SharedParticipantGroupPermission",
+                                "org.labkey.announcements.model.SecureMessageBoardRespondPermission",
+                                "org.labkey.api.security.permissions.ReadSomePermission",
+                                "org.labkey.api.lists.permissions.ManagePicklistsPermission",
+                                "org.labkey.api.security.permissions.UpdatePermission",
+                                "org.labkey.announcements.model.SecureMessageBoardReadPermission",
+                                "org.labkey.api.security.permissions.SampleWorkflowDeletePermission",
+                                "org.labkey.api.security.permissions.SampleWorkflowJobPermission",
+                                "org.labkey.api.security.permissions.AssayReadPermission",
+                                "org.labkey.api.security.permissions.NotebookReadPermission",
+                                "org.labkey.api.security.permissions.DataClassReadPermission",
+                                "org.labkey.api.security.permissions.MediaReadPermission",
+                                "org.labkey.api.security.permissions.MoveEntitiesPermission",
+                            ],
+                            "groups": []
+                        },
+                        {
+                            "id": 1673,
+                            "name": "testgroup2",
+                            "roles": ["org.labkey.api.security.roles.ReaderRole"],
+                            "isSystemGroup": false,
+                            "isProjectGroup": true,
+                            "type": "g",
+                            "effectivePermissions": [
+                                "org.labkey.api.security.permissions.ReadPermission",
+                                "org.labkey.api.security.permissions.ReadSomePermission",
+                                "org.labkey.api.security.permissions.AssayReadPermission",
+                                "org.labkey.api.security.permissions.DataClassReadPermission",
+                                "org.labkey.api.security.permissions.NotebookReadPermission",
+                                "org.labkey.api.security.permissions.MediaReadPermission"
+                            ],
+                            "groups": []
+                        }
+                    ]
+                }
+            }
+        </response>
+    </test>
+
     <test name="groups for current user" type="get">
-        <url>Security%20Api%20Test%20Project/security-getGroupsForCurrentUser.view?</url>
+        <url>Security%20Api%20Test%20Project/security-getGroupsForCurrentUser.api</url>
         <response>
             {"groups": [
                     {
@@ -115,7 +178,7 @@
     </test>
 
     <test name="ensure login" type="get">
-        <url>Security%20Api%20Test%20Project/security-ensureLogin.view?</url>
+        <url>Security%20Api%20Test%20Project/security-ensureLogin.api</url>
         <response>
             {"currentUser":
                 {

src/org/labkey/test/components/ui/grids/DetailTableEdit.java

@@ -543,6 +543,7 @@ public DetailDataPanel clickCancel()
     {
         String title = getSourceTitle();
         elementCache().cancelButton.click();
+        getWrapper().shortWait().until(ExpectedConditions.stalenessOf(elementCache().cancelButton));
         return new DetailDataPanel.DetailDataPanelFinder(getDriver()).withTitle(title).waitFor();
     }
 

src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java

@@ -158,9 +158,9 @@ public void clickMarkAll()
     public ImportsPage clickViewAll()
     {
         expand();
-        WebDriverWrapper.waitFor(elementCache().viewAllLink::isDisplayed,
+        WebDriverWrapper.waitFor(elementCache().viewAllLink()::isDisplayed,
                 "View all link did not become visible.", 2_500);
-        elementCache().viewAllLink.click();
+        elementCache().viewAllLink().click();
         return new ImportsPage(getWrapper());
     }
 
@@ -278,7 +278,10 @@ public final WebElement markAll()
                     .refindWhenNeeded(elementCache().menuContent);
         }
 
-        public final WebElement viewAllLink = Locator.linkContainingText("View all activity").refindWhenNeeded(this);
+        public final WebElement viewAllLink()
+        {
+            return Locator.linkContainingText("View all activity").refindWhenNeeded(this);
+        }
 
     }