From 186ce83fa0908afa0c0a5f86549f13b6c105def6 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 14 Apr 2025 07:46:15 -0700 Subject: [PATCH] Simplify and expand use of LinkBuilder factory methods --- .../DownloadSequenceDisplayColumnFactory.java | 3 +- .../query/GenbankDisplayColumnFactory.java | 3 +- .../query/SequenceAnalysisCustomizer.java | 12 +++---- .../query/SequenceAnalysisUserSchema.java | 36 ++++++++----------- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java index b5cd00bd6..86e8ec9a3 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java @@ -7,6 +7,7 @@ import org.labkey.api.data.DisplayColumnFactory; import org.labkey.api.data.RenderContext; import org.labkey.api.query.FieldKey; +import org.labkey.api.util.LinkBuilder; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.view.HttpView; import org.labkey.api.view.template.ClientDependency; @@ -40,7 +41,7 @@ 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"). + out.write(LinkBuilder.labkeyLink("Download Sequence"). attributes(Map.of("data-rowid", val.toString())). addClass("sdc-row")); diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java index f35de5fa6..d3fe19645 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java @@ -5,6 +5,7 @@ import org.labkey.api.data.DisplayColumn; import org.labkey.api.data.DisplayColumnFactory; import org.labkey.api.data.RenderContext; +import org.labkey.api.util.LinkBuilder; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.util.URLHelper; import org.labkey.api.writer.HtmlWriter; @@ -38,7 +39,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out) for (String v : vals) { out.write(delim); - out.write(PageFlowUtil.link(v).href(getFormattedURL(v)).clearClasses()); + out.write(LinkBuilder.simpleLink(v, getFormattedURL(v))); delim = "; "; } } diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java index d19a0b445..65261456c 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java @@ -28,6 +28,7 @@ import org.labkey.api.security.User; import org.labkey.api.util.HtmlString; import org.labkey.api.util.HtmlStringBuilder; +import org.labkey.api.util.LinkBuilder; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.view.ActionURL; import org.labkey.api.view.HttpView; @@ -277,20 +278,19 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out) url.addParameter("query.fileSets~contains", token); out.write(delim); - out.write(PageFlowUtil.link(token, url).clearClasses()); + out.write(LinkBuilder.simpleLink(token, url)); delim = COMMA_NEWLINE; } } - out.write(PageFlowUtil.link(""). - clearClasses(). + out.write(LinkBuilder.simpleLink(""). addClass("fa fa-pencil"). addClass("lk-dr-action-icon"). addClass("sfs-row"). attributes(PageFlowUtil.map( - "data-tt", "tooltip", - "data-rowid", rowId.toString(), - "data-original-title", "add/edit" + "data-tt", "tooltip", + "data-rowid", rowId.toString(), + "data-original-title", "add/edit" )) ); diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java index 27aa00773..aa54bf6ac 100644 --- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java +++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java @@ -32,6 +32,7 @@ import org.labkey.api.security.User; import org.labkey.api.sequenceanalysis.pipeline.SequenceOutputHandler; import org.labkey.api.util.HtmlString; +import org.labkey.api.util.LinkBuilder; import org.labkey.api.util.PageFlowUtil; import org.labkey.api.view.ActionURL; import org.labkey.api.writer.HtmlWriter; @@ -251,30 +252,23 @@ private TableInfo createReadsetsTable(TableInfo sourceTable, ContainerFilter cf) newCol.setShownInInsertView(false); newCol.setShownInUpdateView(false); newCol.setCalculated(true); - newCol.setDisplayColumnFactory(new DisplayColumnFactory() + newCol.setDisplayColumnFactory(colInfo -> new DataColumn(colInfo) { @Override - public DisplayColumn createRenderer(ColumnInfo colInfo) + public void renderGridCellContents(RenderContext ctx, HtmlWriter out) { - return new DataColumn(colInfo) + Object o = getValue(ctx); + if (o != null) { - @Override - public void renderGridCellContents(RenderContext ctx, HtmlWriter out) - { - Object o = getValue(ctx); - if (o != null) - { - 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)", url)); - } - else - { - out.write("No Files"); - } - } - }; + 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(LinkBuilder.labkeyLink("View File(s)", url)); + } + else + { + out.write("No Files"); + } } }); ret.addColumn(newCol); @@ -458,7 +452,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, url).clearClasses()); + out.write(LinkBuilder.simpleLink(token, url)); delim = HtmlString.BR; } }