From 2573bda34ac4d84af08a50a9207277da6606ddd3 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 5 Jan 2026 13:50:36 -0800 Subject: [PATCH 1/2] GitHub Issue 717: Reserve fields from ExpDataTable in DataClassDomainKind --- src/org/labkey/test/tests/DataClassTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/org/labkey/test/tests/DataClassTest.java b/src/org/labkey/test/tests/DataClassTest.java index dd39eb96a4..774d271090 100644 --- a/src/org/labkey/test/tests/DataClassTest.java +++ b/src/org/labkey/test/tests/DataClassTest.java @@ -164,6 +164,13 @@ public void testReservedFieldNames() "'name' is a reserved field name in 'Reserved Field Names Test'.", "Please correct errors in Reserved Field Names Test before saving."), createPage.clickSaveExpectingErrors()); + domainFormPanel.removeAllFields(false); + + domainFormPanel.manuallyDefineFields("protocol"); + assertEquals("Data class reserved field name error", Arrays.asList( + "'protocol' is a reserved field name in 'Reserved Field Names Test'.", + "Please correct errors in Reserved Field Names Test before saving."), + createPage.clickSaveExpectingErrors()); createPage.clickCancel(); } From c5c90671689e7b958a83462fda3b991da555f04e Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 6 Jan 2026 12:11:56 -0800 Subject: [PATCH 2/2] Also reserve fields from ExpDataClassTable (to mirror what we do for sample types) --- src/org/labkey/test/tests/DataClassTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/org/labkey/test/tests/DataClassTest.java b/src/org/labkey/test/tests/DataClassTest.java index 774d271090..245ac767de 100644 --- a/src/org/labkey/test/tests/DataClassTest.java +++ b/src/org/labkey/test/tests/DataClassTest.java @@ -171,6 +171,13 @@ public void testReservedFieldNames() "'protocol' is a reserved field name in 'Reserved Field Names Test'.", "Please correct errors in Reserved Field Names Test before saving."), createPage.clickSaveExpectingErrors()); + domainFormPanel.removeAllFields(false); + + domainFormPanel.manuallyDefineFields("Name Expression"); + assertEquals("Data class reserved field name error", Arrays.asList( + "'Name Expression' is a reserved field name in 'Reserved Field Names Test'.", + "Please correct errors in Reserved Field Names Test before saving."), + createPage.clickSaveExpectingErrors()); createPage.clickCancel(); }