Skip to content

[bot] Merge 26.1 to develop #1161

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
Jan 7, 2026
Merged

[bot] Merge 26.1 to develop #1161

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
ac7e2a2
Ticket 54342: PanoramaWeb overwhelmed with requests for massive targe…
labkey-jeckels Dec 31, 2025
42409dd
Bump schema versions to 26.000 (#1156)
labkey-adam Jan 1, 2026
f14a0cf
Merge 25.11 to 26.1
labkey-teamcity Jan 6, 2026
ded4002
Merge 26.1 to develop
labkey-teamcity Jan 7, 2026
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
2 changes: 1 addition & 1 deletion src/org/labkey/targetedms/TargetedMSModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public String getName()
@Override
public Double getSchemaVersion()
{
return 25.007;
return 26.000;
}

@Override
Expand Down
7 changes: 7 additions & 0 deletions src/org/labkey/targetedms/chart/ChromatogramDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,7 @@ protected String getSeriesLabel()

public static class GroupDataset extends RtRangeDataset
{
private static final int SERIES_LIMIT = 25;
private final PeptideGroup _group;
private final SampleFile _sampleFile;
private final ViewContext _context;
Expand Down Expand Up @@ -1570,6 +1571,12 @@ protected List<PrecursorChromInfoPlus> getPrecursorChromInfos()
}
}

// Ticket 54342: PanoramaWeb overwhelmed with requests for massive targetedms-groupChromatogramChart.view plots
if (_allMolecules.size() > SERIES_LIMIT)
{
_allMolecules = _allMolecules.entrySet().stream().limit(SERIES_LIMIT).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
}

List<PrecursorChromInfoPlus> nonOptimizationPeaks = new ArrayList<>();
for(List<PrecursorChromInfoPlus> infos : _allMolecules.values())
{
Expand Down