Skip to content

Simplify and expand use of LinkBuilder factory methods #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Apr 14, 2025
Merged

Simplify and expand use of LinkBuilder factory methods #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...eAnalysis/src/org/labkey/sequenceanalysis/query/DownloadSequenceDisplayColumnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));

Expand Down
3 changes: 2 additions & 1 deletion SequenceAnalysis/src/org/labkey/sequenceanalysis/query/GenbankDisplayColumnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = "; ";
}
}
Expand Down
12 changes: 6 additions & 6 deletions SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"
))
);

Expand Down
36 changes: 15 additions & 21 deletions SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceAnalysisUserSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
}
Expand Down