CR feedback - revert back to original impl of FileAttachmentContainer.fileUploadFieldKey

Author: cnathe

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));
     }
 

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<FileAttachmentContainer, FileAttachmentContainerFinder>