Skip to content

GH Issue 1257: Check for duplicates among field names, import aliases, and parent import aliases #3128

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

Open
labkey-susanh wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

GH Issue 1257: Check for duplicates among field names, import aliases, and parent import aliases #3128

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b49501
GH Issue 1257: Check for duplicates among field names, import aliases…
labkey-susanh Jul 27, 2026
c32433e
Revert change to log message
labkey-susanh Jul 27, 2026
599d66e
Move field validation to DomainUtil.validateProperties to be applicab…
labkey-susanh Jul 27, 2026
6b45175
spacing
labkey-susanh Jul 27, 2026
19928c9
Merge remote-tracking branch 'origin/develop' into fb_aliasDupes
labkey-susanh Jul 28, 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
16 changes: 12 additions & 4 deletions src/org/labkey/test/tests/SampleTypeParentColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,6 @@ public void testAliasNameConflictsWithFieldName()
goToProjectHome();
projectMenu().navigateToFolder(PROJECT_NAME, SUB_FOLDER_NAME);

String path = PROJECT_NAME + "/" + SUB_FOLDER_NAME;

List<FieldDefinition> fields = new ArrayList<>();

fields.add(new FieldDefinition(ALIAS_NAME_CONFLICT, FieldDefinition.ColumnType.String));
Expand All @@ -726,7 +724,7 @@ public void testAliasNameConflictsWithFieldName()
String.join("\n", errors));
updatePage.removeParentAlias(0);

log("Now add a valid parent column and check that you cannot now add a field in the sample type with the same name.");
log("Now add a valid parent column and check that you cannot add a field in the sample type with the same name.");
updatePage.addParentAlias(GOOD_PARENT_NAME, SampleTypeDesigner.CURRENT_SAMPLE_TYPE);
updatePage.clickSave();

Expand All @@ -751,7 +749,17 @@ public void testAliasNameConflictsWithFieldName()

updatePage.clickCancel();

log("Validated name conflicts.");
// GH Issue 1257
clickFolder(SUB_FOLDER_NAME);
log("Check that you cannot add a field with an import alias that conflicts with the parent import alias");
updatePage = sampleHelper.goToEditSampleType(SAMPLE_TYPE_NAME);
updatePage.getFieldsPanel().addField("DupeAliasCheck")
.setImportAliases(GOOD_PARENT_NAME);
errors = updatePage.clickSaveExpectingErrors();
errorMsgExpectedTxt = "Field DupeAliasCheck has an import alias " + GOOD_PARENT_NAME + " that conflicts with a parent alias header.";

@cnathe cnathe Jul 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

any reason we need to add some checks for the other cases here like having multiple fields that have the same import alias or having an import alias that matches a parent alias? Or maybe some of that could be covered with junit tests (not sure what our validation coverage looks like there for domains).

@labkey-susanh labkey-susanh Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I didn't include that here because this test class is specifically for SampleTypeParentColumnTest. So, tests aren't completely done for this branch.

assertThat("Error message", String.join("\n", errors), CoreMatchers.containsString(errorMsgExpectedTxt));

updatePage.clickCancel();
}

@Test
Expand Down