From ff8657887eb33b7e6eead7d5d19fd9f1e4a25ce3 Mon Sep 17 00:00:00 2001 From: Nick Kerr Date: Fri, 18 Jul 2025 09:50:06 -0700 Subject: [PATCH 1/2] Issue 53243: add "includeEmptyPermGroups" to security-getGroupPerms.api (#2569) --- data/api/security-api.xml | 69 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/data/api/security-api.xml b/data/api/security-api.xml index 688f393006..24e82f1a07 100644 --- a/data/api/security-api.xml +++ b/data/api/security-api.xml @@ -1,7 +1,7 @@ - Security%20API%20Test%20Project/security-getGroupPerms.view? + Security%20API%20Test%20Project/security-getGroupPerms.api {"container": { @@ -93,8 +93,71 @@ + + Security%20API%20Test%20Project/security-getGroupPerms.api?includeEmptyPermGroups=false + + {"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": [] + } + ] + } + } + + + - Security%20Api%20Test%20Project/security-getGroupsForCurrentUser.view? + Security%20Api%20Test%20Project/security-getGroupsForCurrentUser.api {"groups": [ { @@ -115,7 +178,7 @@ - Security%20Api%20Test%20Project/security-ensureLogin.view? + Security%20Api%20Test%20Project/security-ensureLogin.api {"currentUser": { From c3152679777097d259878447d460111725f0384d Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Mon, 21 Jul 2025 05:56:42 -0700 Subject: [PATCH 2/2] Update DetailTableEdit.clickCancel (#2572) --- .../labkey/test/components/ui/grids/DetailTableEdit.java | 1 + .../ui/notifications/ServerNotificationMenu.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java index f153ac42df..7bf5e6204c 100644 --- a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java +++ b/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(); } diff --git a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java b/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java index 1ea7e3216d..55b727db29 100644 --- a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java +++ b/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); + } }