Skip to content

GitHub Issue 717: Reserve fields from ExpDataTable in DataClassDomainKind #7311

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-susanh merged 3 commits into from
Jan 7, 2026
Merged

GitHub Issue 717: Reserve fields from ExpDataTable in DataClassDomainKind #7311

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c62b30
GitHub Issue 717: Reserve fields from ExpDataTable in DataClassDomain…
labkey-susanh Jan 5, 2026
b40bca4
Also reserve fields from ExpDataClassTable (to mirror what we do for …
labkey-susanh Jan 6, 2026
d3aa1a2
Merge remote-tracking branch 'origin/develop' into fb_moreReservations
labkey-susanh Jan 6, 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
5 changes: 5 additions & 0 deletions experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import org.labkey.api.exp.property.DomainUtil;
import org.labkey.api.exp.query.DataClassUserSchema;
import org.labkey.api.exp.query.ExpDataClassDataTable;
import org.labkey.api.exp.query.ExpDataClassTable;
import org.labkey.api.exp.query.ExpDataTable;
import org.labkey.api.gwt.client.DefaultValueType;
import org.labkey.api.gwt.client.model.GWTDomain;
import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
Expand Down Expand Up @@ -107,6 +109,9 @@ public class DataClassDomainKind extends AbstractDomainKind<DataClassDomainKindP
names.addAll(Arrays.stream(ExpDataClassDataTable.Column.values()).map(ExpDataClassDataTable.Column::name).toList());
names.add("RunId"); // Issue 50461
names.add("Container");
// GitHub Issue 717
names.addAll(Arrays.stream(ExpDataTable.Column.values()).map(ExpDataTable.Column::name).toList());
Copy link
Contributor

@XingY XingY Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should columns from ExpDataClassTable (such as nameexpression, datacount) also be reserved? This is the case for sampleType domain.

Copy link
Contributor Author

@labkey-susanh labkey-susanh Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. It seems a bit unnecessary but better to have them both doing the same kinds of reservations.

names.addAll(Arrays.stream(ExpDataClassTable.Column.values()).map(ExpDataClassTable.Column::name).toList());

RESERVED_NAMES = DomainUtil.getNamesAndLabels(names);

Expand Down