Skip to content

[bot] Merge 25.7 to develop #2573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
Jul 22, 2025
Merged

[bot] Merge 25.7 to develop #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff86578
Issue 53243: add "includeEmptyPermGroups" to security-getGroupPerms.a…
labkey-nicka Jul 18, 2025
c315267
Update DetailTableEdit.clickCancel (#2572)
labkey-danield Jul 21, 2025
c71ae82
Merge 25.7 to develop
labkey-teamcity Jul 22, 2025
a1df458
Merge branch 'develop' into fb_bot_merge_25.7
cnathe Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 66 additions & 3 deletions data/api/security-api.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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":
{
Expand Down Expand Up @@ -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": [
{
Expand All @@ -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":
{
Expand Down
1 change: 1 addition & 0 deletions src/org/labkey/test/components/ui/grids/DetailTableEdit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
9 changes: 6 additions & 3 deletions src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down Expand Up @@ -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);
}

}

Expand Down