From 5e67b0bfc8678c6c1e4e0ac96c54c6e72eadd07d Mon Sep 17 00:00:00 2001 From: cnathe Date: Mon, 2 Jun 2025 15:41:21 -0500 Subject: [PATCH 1/2] Issue 52556: remove "-fileUpload" from file field input id --- .../ui/entities/EntityBulkInsertDialog.java | 12 +----------- .../ui/entities/EntityBulkUpdateDialog.java | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java index 49b7c87ad3..99897412b2 100644 --- a/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java +++ b/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java @@ -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() { @@ -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 fieldLabels() diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java index a0401f67b7..92413a472c 100644 --- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java +++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java @@ -244,7 +244,6 @@ public String getDateField(CharSequence fieldIdentifier) */ public FileAttachmentContainer getFileField(CharSequence fieldIdentifier) { - fieldIdentifier = EntityBulkInsertDialog.fileUploadFieldKey(fieldIdentifier); return enableAndWait(fieldIdentifier, elementCache().fileUploadField(fieldIdentifier)); } From 4a2b8750519f08e85f03e66266dd3c58fcff0249 Mon Sep 17 00:00:00 2001 From: cnathe Date: Fri, 6 Jun 2025 16:06:07 -0500 Subject: [PATCH 2/2] test fixes for the removal of the "-fileUpload" input id suffix --- .../test/components/ui/entities/EntityBulkUpdateDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java index 17f41dc2be..289c1e7007 100644 --- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java +++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java @@ -271,7 +271,7 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier) public FileUploadField getExistingFileField(String fieldIdentifier) { - return elementCache().fileField(fieldIdentifier); + return enableAndWait(fieldIdentifier, elementCache().fileField(fieldIdentifier)); } /**