Skip to content

Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) #2473

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
cnathe merged 6 commits into from
Jun 9, 2025
Merged

Issue 52556: Add data-fieldkey attribute to grid header elements and input elements (part 2) #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e67b0b
Issue 52556: remove "-fileUpload" from file field input id
cnathe Jun 2, 2025
d233d0f
Merge branch 'develop' into fb_testFieldKey52556
cnathe Jun 4, 2025
37ac373
Merge branch 'develop' into fb_testFieldKey52556
cnathe Jun 6, 2025
7d8e502
Merge branch 'develop' into fb_testFieldKey52556
cnathe Jun 6, 2025
4a2b875
test fixes for the removal of the "-fileUpload" input id suffix
cnathe Jun 6, 2025
806d697
Merge branch 'develop' into fb_testFieldKey52556
cnathe Jun 9, 2025
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: 1 addition & 11 deletions src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,16 +440,6 @@ protected void waitForReady()
getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable( elementCache().addRowsButton ));
}

/**
* File upload fields append "-fileUpload" to the field's fieldKey
* @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey})
* @return FieldKey with expected suffix
*/
public static FieldKey fileUploadFieldKey(CharSequence fieldIdentifier)
{
return FieldKey.fromFieldKey(FieldKey.fromName(fieldIdentifier) + "-fileUpload");
}

@Override
protected ElementCache newElementCache()
{
Expand Down Expand Up @@ -514,7 +504,7 @@ public ReactDateTimePicker dateInput(CharSequence fieldIdentifier)

public FileAttachmentContainer fileUploadField(CharSequence fieldIdentifier)
{
return new FileAttachmentContainer(formRow(fileUploadFieldKey(fieldIdentifier)), getDriver());
return new FileAttachmentContainer(formRow(fieldIdentifier), getDriver());
}

public List<WebElement> fieldLabels()
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ public String getDateField(CharSequence fieldIdentifier)
*/
public FileAttachmentContainer getFileField(CharSequence fieldIdentifier)
{
fieldIdentifier = EntityBulkInsertDialog.fileUploadFieldKey(fieldIdentifier);
return enableAndWait(fieldIdentifier, elementCache().fileUploadField(fieldIdentifier));
}

Expand All @@ -272,7 +271,7 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier)

public FileUploadField getExistingFileField(String fieldIdentifier)
{
return elementCache().fileField(fieldIdentifier);
return enableAndWait(fieldIdentifier, elementCache().fileField(fieldIdentifier));
}

/**
Expand Down