From da8ac943cf9f4999cef6e85ab01983d860b96899 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 2 Jul 2025 17:03:14 -0500 Subject: [PATCH 1/2] Test identifier updates for -fileUpload suffix revert --- .../test/components/ui/entities/EntityBulkUpdateDialog.java | 6 ++++-- .../test/components/ui/files/FileAttachmentContainer.java | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java index a5300dca78..47e87993d7 100644 --- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java +++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java @@ -245,7 +245,8 @@ public String getDateField(CharSequence fieldIdentifier) */ public FileAttachmentContainer getFileField(CharSequence fieldIdentifier) { - return enableAndWait(fieldIdentifier, elementCache().fileUploadField(fieldIdentifier)); + String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString()); + return enableAndWait(identifier, elementCache().fileUploadField(identifier)); } /** @@ -271,7 +272,8 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier) public FileUploadField getExistingFileField(String fieldIdentifier) { - return enableAndWait(fieldIdentifier, elementCache().fileField(fieldIdentifier)); + String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString()); + return enableAndWait(identifier, elementCache().fileField(identifier)); } /** diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java index bb6acebe86..8de6d5c75c 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java @@ -195,6 +195,10 @@ protected class ElementCache extends Component.ElementCache public Locator fileUploadScrollFooterLoc = Locator.tagWithClass("div", "file-upload__scroll-footer"); } + public static String fileUploadIdentifier(String fieldIdentifier) + { + return fieldIdentifier + "-fileUpload"; // Issue 53394 + } public static class FileAttachmentContainerFinder extends WebDriverComponentFinder { From dd1cbee2a7b016aaef7e9ae01f534a5818e6c27c Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 3 Jul 2025 16:31:08 -0500 Subject: [PATCH 2/2] CR feedback - revert back to original impl of FileAttachmentContainer.fileUploadFieldKey --- .../components/ui/entities/EntityBulkUpdateDialog.java | 8 ++++---- .../components/ui/files/FileAttachmentContainer.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java index 6823720df9..09aee4dcc9 100644 --- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java +++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java @@ -253,9 +253,9 @@ public String getDateField(CharSequence fieldIdentifier) * @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey}) * @return file attachment component */ - public FileAttachmentContainer getFileField(CharSequence fieldIdentifier) + private FileAttachmentContainer getFileField(CharSequence fieldIdentifier) { - String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString()); + FieldKey identifier = FileAttachmentContainer.fileUploadFieldKey(fieldIdentifier); return enableAndWait(identifier, elementCache().fileUploadField(identifier)); } @@ -280,9 +280,9 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier) return this; } - public FileUploadField getExistingFileField(String fieldIdentifier) + public FileUploadField getExistingFileCard(CharSequence fieldIdentifier) { - String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString()); + FieldKey identifier = FileAttachmentContainer.fileUploadFieldKey(fieldIdentifier); return enableAndWait(identifier, elementCache().fileField(identifier)); } diff --git a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java index 8de6d5c75c..01cbeb7946 100644 --- a/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java +++ b/src/org/labkey/test/components/ui/files/FileAttachmentContainer.java @@ -6,6 +6,7 @@ import org.labkey.test.components.WebDriverComponent; import org.labkey.test.components.html.FileInput; import org.labkey.test.components.html.Input; +import org.labkey.test.params.FieldKey; import org.openqa.selenium.ElementNotInteractableException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -195,9 +196,14 @@ protected class ElementCache extends Component.ElementCache public Locator fileUploadScrollFooterLoc = Locator.tagWithClass("div", "file-upload__scroll-footer"); } - public static String fileUploadIdentifier(String fieldIdentifier) + /** + * 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 fieldIdentifier + "-fileUpload"; // Issue 53394 + return FieldKey.fromFieldKey(FieldKey.fromName(fieldIdentifier) + "-fileUpload"); // Issue 53394 } public static class FileAttachmentContainerFinder extends WebDriverComponentFinder