Issue 54062: Strip folder name from displayed name from file field (#7123)

Author: XingY

api/src/org/labkey/api/data/AbstractFileDisplayColumn.java

@@ -77,6 +77,11 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
     /** @return the short name of the file (not including full path) */
     protected abstract String getFileName(RenderContext ctx, Object value);
 
+    protected String getFileName(RenderContext ctx, Object value, boolean isDisplay)
+    {
+        return getFileName(ctx, value);
+    }
+
     protected abstract InputStream getFileContents(RenderContext ctx, Object value) throws FileNotFoundException;
 
     protected void renderIconAndFilename(RenderContext ctx, HtmlWriter out, String fileValue, boolean link, boolean thumbnail)
@@ -99,7 +104,7 @@ protected void renderIconAndFilename(RenderContext ctx, HtmlWriter out, String f
             // equivalent of DisplayColumn.renderURL.
             // Don't want to call renderUrl (DataColumn.renderUrl) to skip unnecessary displayValue check
             StringExpression s = compileExpression(ctx.getViewContext());
-            String displayName = getFileName(ctx, fileValue);
+            String displayName = getFileName(ctx, fileValue, true);
             boolean unavailable = displayName.endsWith(UNAVAILABLE_FILE_SUFFIX);
             String url = null == s || unavailable ? null : s.eval(ctx);
             boolean isImage = isImage(fileValue);

api/src/org/labkey/api/study/assay/FileLinkDisplayColumn.java

@@ -288,6 +288,12 @@ public static boolean filePathExist(String path, Container container, User user)
 
     @Override
     protected String getFileName(RenderContext ctx, Object value)
+    {
+        return getFileName(ctx, value, false);
+    }
+
+    @Override
+    protected String getFileName(RenderContext ctx, Object value, boolean isDisplay)
     {
         String result = value == null ? null : StringUtils.trimToNull(value.toString());
         if (result != null)
@@ -335,6 +341,10 @@ protected String getFileName(RenderContext ctx, Object value)
                     result = relativize(f, FileContentService.get().getFileRoot(container, fileRootType));
                     if (result != null)
                     {
+                        // Issue 54062: Strip folder name from displayed name
+                        if (isDisplay)
+                            result = f.getName();
+
                         valid = true;
                         break;
                     }
@@ -438,13 +448,13 @@ else if (f.isDirectory())
     @Override
     public Object getDisplayValue(RenderContext ctx)
     {
-        return getFileName(ctx, super.getDisplayValue(ctx));
+        return getFileName(ctx, super.getDisplayValue(ctx), true);
     }
 
     @Override
     public Object getJsonValue(RenderContext ctx)
     {
-        return getDisplayValue(ctx);
+        return getFileName(ctx, super.getDisplayValue(ctx));
     }
 
     @Override

study/test/src/org/labkey/test/tests/study/StudyDatasetFileFieldTest.java

@@ -146,12 +146,7 @@ public void testFileField() throws IOException, CommandException
                 .selectDatasetByName(datasetName)
                 .clickViewData();
 
-        String expectedText;
-
-        if (SystemUtils.IS_OS_WINDOWS)
-            expectedText = "datasetdata\\sample.txt";
-        else
-            expectedText = "datasetdata/sample.txt";
+        String expectedText = "sample.txt";
 
         assertElementPresent("Did not find the expected sample.txt from the imported dataset.", Locator.tagContainingText("a", expectedText), 1);
         downloadedFile = doAndWaitForDownload(() -> waitAndClick(WAIT_FOR_JAVASCRIPT, Locator.tagWithAttribute("a", "title", "Download attached file"), 0));