Finish renderGridCellContents migration

Author: bbimber

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java

@@ -40,9 +40,9 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
             public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
             {
                 Integer val = ctx.get(FieldKey.fromString(getBoundColumn().getFieldKey().getParent(), "rowId"), Integer.class);
-                out.write(PageFlowUtil.link("Download Sequence").attributes(Map.of(
-                    "data-rowid", val.toString()
-                )).addClass("sdc-row"));
+                out.write(PageFlowUtil.link("Download Sequence").
+                        attributes(Map.of("data-rowid", val.toString())).
+                        addClass("sdc-row"));
 
                 if (!_handlerRegistered)
                 {

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java

@@ -6,6 +6,7 @@
 import org.labkey.api.data.DisplayColumnFactory;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.URLHelper;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.io.IOException;
@@ -37,7 +38,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     for (String v : vals)
                     {
                         out.write(delim);
-                        out.write(PageFlowUtil.link(v).href(getFormattedURL(v)));
+                        out.write(PageFlowUtil.link(v).href(getFormattedURL(v)).clearClasses());
                         delim = "; ";
                     }
                 }

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java

@@ -27,14 +27,14 @@
 import org.labkey.api.query.QueryService;
 import org.labkey.api.security.User;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.HtmlStringBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.sequenceanalysis.SequenceAnalysisSchema;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 
@@ -43,6 +43,8 @@
  */
 public class SequenceAnalysisCustomizer implements TableCustomizer
 {
+    private static final HtmlString COMMA_NEWLINE = HtmlStringBuilder.of(",").append(HtmlString.BR).getHtmlString();
+
     @Override
     public void customize(TableInfo tableInfo)
     {
@@ -275,12 +277,13 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                                 url.addParameter("query.fileSets~contains", token);
 
                                 out.write(delim);
-                                out.write(PageFlowUtil.link(token).href(url));
-                                delim = HtmlString.join(Arrays.asList(HtmlString.of(","), HtmlString.BR), HtmlString.EMPTY_STRING);
+                                out.write(PageFlowUtil.link(token, url).clearClasses());
+                                delim = COMMA_NEWLINE;
                             }
                         }
 
                         out.write(PageFlowUtil.link("").
+                                clearClasses().
                                 addClass("fa fa-pencil").
                                 addClass("lk-dr-action-icon").
                                 addClass("sfs-row").

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java

@@ -267,7 +267,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                                 ActionURL url = QueryService.get().urlFor(getUser(), ctx.getContainer(), QueryAction.executeQuery, SequenceAnalysisSchema.SCHEMA_NAME, SequenceAnalysisSchema.TABLE_READ_DATA);
                                 url.addFilter("query", FieldKey.fromString("readset"), CompareType.EQUAL, o);
 
-                                out.write(PageFlowUtil.link("View File(s)").href(url).addClass("labkey-text-link"));
+                                out.write(PageFlowUtil.link("View File(s)", url));
                             }
                             else
                             {
@@ -458,7 +458,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                             ActionURL url = DetailsURL.fromString(_baseUrl + PageFlowUtil.encode(token), ctx.getContainer()).getActionURL();
 
                             out.write(delim);
-                            out.write(PageFlowUtil.link(token).href(url));
+                            out.write(PageFlowUtil.link(token, url).clearClasses());
                             delim = HtmlString.BR;
                         }
                     }