Skip to content

1026: Include rowId in serialized data rows #7619

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
labkey-nicka merged 3 commits into from
Apr 23, 2026
Merged

1026: Include rowId in serialized data rows #7619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ad9ee
Initial test updates
labkey-nicka Apr 22, 2026
797e298
1026: Include rowId in serialized data rows
labkey-nicka Apr 22, 2026
3edf174
Regression tests
labkey-nicka Apr 22, 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
12 changes: 6 additions & 6 deletions api/src/org/labkey/api/exp/api/AssayJSONConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@ public static JSONObject serializeBatch(ExpExperiment batch, AssayProvider provi
public static JSONArray serializeDataRows(ExpData data, AssayProvider provider, ExpProtocol protocol, User user, Long... objectIds)
{
Domain dataDomain = provider.getResultsDomain(protocol);
TableInfo tableInfo = provider.createProtocolSchema(user, data.getContainer(), protocol, null).createDataTable(null);
if (tableInfo == null)
return new JSONArray();

// GitHub Issue #1026: Include rowId in serialized data rows
List<FieldKey> fieldKeys = new ArrayList<>();
fieldKeys.add(FieldKey.fromParts(AbstractTsvAssayProvider.ROW_ID_COLUMN_NAME));
for (DomainProperty property : dataDomain.getProperties())
{
fieldKeys.add(FieldKey.fromParts(property.getName()));
}

if (fieldKeys.isEmpty())
{
return new JSONArray();
}

TableInfo tableInfo = provider.createProtocolSchema(user, data.getContainer(), protocol, null).createDataTable(null);
Map<FieldKey, ColumnInfo> columns = QueryService.get().getColumns(tableInfo, fieldKeys);
assert columns.size() == fieldKeys.size() : "Missing a column for at least one of the properties";
SimpleFilter filter = new SimpleFilter(FieldKey.fromParts(AbstractTsvAssayProvider.DATA_ID_COLUMN_NAME), data.getRowId());
Expand Down
Loading
Loading