Skip to content

Improve display element builders #874

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 2 commits into from
Apr 13, 2025
Merged

Improve display element builders #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a1221
Improve display element builders
labkey-adam Apr 11, 2025
104517c
Use simpleLink()
labkey-adam Apr 12, 2025
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
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/controllers/editscript/CompensationCalculationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.fhcrc.cpas.flow.script.xml.ScriptDocument;
import org.json.JSONArray;
import org.labkey.api.query.FieldKey;
import org.labkey.api.util.element.Select.SelectBuilder;
import org.labkey.api.util.SelectBuilder;
import org.labkey.flow.analysis.model.Analysis;
import org.labkey.flow.analysis.model.AutoCompensationScript;
import org.labkey.flow.analysis.model.Population;
Expand Down
6 changes: 3 additions & 3 deletions flow/src/org/labkey/flow/controllers/editscript/ScriptController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,12 +448,12 @@ public PopulationName[] getGroupAnalysisNames()
List<PopulationName> ret = new ArrayList<>();
for (Analysis analysis : form._workspaceObject.getGroupAnalyses().values())
{
if (analysis.getPopulations().size() > 0)
if (!analysis.getPopulations().isEmpty())
{
ret.add(analysis.getName());
}
}
return ret.toArray(new PopulationName[ret.size()]);
return ret.toArray(new PopulationName[0]);
}

public Map<String, String> getSampleAnalysisNames()
Expand All @@ -466,7 +466,7 @@ public Map<String, String> getSampleAnalysisNames()
for (Workspace.SampleInfo sample : form._workspaceObject.getSamplesComplete())
{
Analysis analysis = form._workspaceObject.getSampleAnalysis(sample);
if (analysis.getPopulations().size() > 0)
if (!analysis.getPopulations().isEmpty())
{
ret.put(sample.getSampleId(), sample.getLabel());
}
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/controllers/editscript/uploadAnalysis.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/
%>
<%@ page import="org.labkey.api.util.element.Input.InputBuilder" %>
<%@ page import="org.labkey.api.util.InputBuilder" %>
<%@ page import="org.labkey.flow.analysis.model.PopulationName" %>
<%@ page import="org.labkey.flow.analysis.model.StatisticSet" %>
<%@ page import="org.labkey.flow.controllers.editscript.ScriptController.UploadAnalysisAction" %>
Expand Down
7 changes: 3 additions & 4 deletions flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.SimpleNamedObject;
import org.labkey.api.util.StringExpression;
import org.labkey.api.util.element.Input.InputBuilder;
import org.labkey.api.util.InputBuilder;
import org.labkey.api.view.GridView;
import org.labkey.api.writer.HtmlWriter;
import org.labkey.flow.analysis.model.ISampleInfo;
Expand Down Expand Up @@ -335,8 +335,7 @@ protected void renderExtraRecordSelectorContent(RenderContext ctx, HtmlWriter ou
{
// Add a hidden input for spring form binding -- if this value is posted, the row was unchecked.
out.write(
new InputBuilder<>()
.type("hidden")
InputBuilder.hidden()
.name(SpringActionController.FIELD_MARKER + getRecordSelectorName(ctx))
.value(0)
);
Expand Down Expand Up @@ -515,7 +514,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
String sampleId = ctx.get(SAMPLE_ID_FIELD_KEY, String.class);
for (FlowFCSFile candidate : candidates)
{
out.write(new InputBuilder<>().type("hidden").name("selectedSamples.rows[" + sampleId + "].candidateFile").value(candidate.getRowId()));
out.write(InputBuilder.hidden().name("selectedSamples.rows[" + sampleId + "].candidateFile").value(candidate.getRowId()));
out.write("\n");
}
}
Expand Down
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/
%>
<%@ page import="org.labkey.api.util.element.Option" %>
<%@ page import="org.labkey.api.util.OptionBuilder" %>
<%@ page import="org.labkey.api.view.ActionURL" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.flow.analysis.web.GraphSpec" %>
Expand Down Expand Up @@ -141,7 +141,7 @@
<td>
<%=select().name(FlowParam.actionSequence.name())
.className(null)
.addOptions(steps.stream().map(s->new Option.OptionBuilder(s.getLabel(), s.getDefaultActionSequence()).selected(s == finalStep)))
.addOptions(steps.stream().map(s->new OptionBuilder(s.getLabel(), s.getDefaultActionSequence()).selected(s == finalStep)))
.onChange("this.form.submit();")
%>
</td>
Expand Down
4 changes: 2 additions & 2 deletions luminex/src/org/labkey/luminex/LuminexUploadWizardAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import org.labkey.api.study.assay.ParticipantVisitResolverType;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.element.Input;
import org.labkey.api.util.InputBuilder;
import org.labkey.api.view.HttpView;
import org.labkey.api.view.InsertView;
import org.labkey.api.view.JspView;
Expand Down Expand Up @@ -438,7 +438,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
TD(
at(style, "display:" + (hideCell ? "none" : "table-cell")).
name(titrationCellName),
new Input.InputBuilder<>().type("checkbox").name(id).id(id)
InputBuilder.checkbox().name(id).id(id)
).appendTo(out);

StringBuilder onchange = new StringBuilder("b = this.checked;");
Expand Down
6 changes: 2 additions & 4 deletions luminex/src/org/labkey/luminex/query/AnalytePropStandardsDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@
import org.labkey.api.data.SqlSelector;
import org.labkey.api.util.DOM;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.element.Input.InputBuilder;
import org.labkey.api.util.InputBuilder;
import org.labkey.api.writer.HtmlWriter;
import org.labkey.luminex.LuminexRunUploadForm;
import org.labkey.luminex.LuminexUploadWizardAction;
import org.labkey.luminex.model.Analyte;
import org.labkey.luminex.model.Titration;

import java.io.IOException;
import java.io.Writer;
import java.util.Map;
import java.util.Set;

Expand Down Expand Up @@ -117,7 +115,7 @@ else if (defVal == null || defVal.equalsIgnoreCase("true"))
}
}

out.write(new InputBuilder<>().type("checkbox").value(1).name(propertyName).checked(checked));
out.write(InputBuilder.checkbox().value(1).name(propertyName).checked(checked));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion luminex/src/org/labkey/luminex/query/ExclusionUIDisplayColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.labkey.api.util.DOM;
import org.labkey.api.util.DOM.Attribute;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.Link.LinkBuilder;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.writer.HtmlWriter;

Expand Down
2 changes: 1 addition & 1 deletion luminex/src/org/labkey/luminex/query/LuminexProtocolSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
import org.labkey.api.study.Dataset;
import org.labkey.api.study.publish.StudyPublishService;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.Link.LinkBuilder;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.DataView;
Expand Down
2 changes: 1 addition & 1 deletion luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.labkey.api.util.HtmlStringBuilder;
import org.labkey.api.util.JavaScriptFragment;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.element.Select.SelectBuilder;
import org.labkey.api.util.SelectBuilder;
import org.labkey.api.writer.HtmlWriter;
import org.labkey.luminex.LuminexDataHandler;

Expand Down
4 changes: 2 additions & 2 deletions luminex/src/org/labkey/luminex/query/NegativeBeadDisplayColumnGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.labkey.api.data.DisplayColumnGroup;
import org.labkey.api.data.RenderContext;
import org.labkey.api.util.DOM;
import org.labkey.api.util.element.Input;
import org.labkey.api.util.InputBuilder;
import org.labkey.api.view.HttpView;
import org.labkey.api.writer.HtmlWriter;
import org.labkey.luminex.LuminexDataHandler;
Expand All @@ -46,7 +46,7 @@ public void writeSameCheckboxCell(RenderContext ctx, HtmlWriter out)
isCopyable() ? (DOM.Renderable) ret -> {
String inputName = ColumnInfo.propNameFromName(_inputName);
String id = inputName + "CheckBox";
new Input.InputBuilder<>().type("checkbox").name(id).id(id).appendTo(out);
InputBuilder.checkbox().name(id).id(id).appendTo(out);
StringBuilder onChange = new StringBuilder("b = this.checked;\n");

getColumns().forEach(col -> {
Expand Down
4 changes: 2 additions & 2 deletions luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
%>
<%@ page import="org.labkey.api.data.DataRegion" %>
<%@ page import="org.labkey.api.data.DataRegionSelection" %>
<%@ page import="org.labkey.api.util.Link" %>
<%@ page import="org.labkey.api.util.LinkBuilder" %>
<%@ page import="org.labkey.api.view.ActionURL" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.api.view.JspView" %>
Expand Down Expand Up @@ -61,7 +61,7 @@
<% for (GuideSet gs : guideSets) { %>
<li>
<%
new Link.LinkBuilder("Guide Set " + gs.getGuideSetId() + ": " + gs.getComment())
new LinkBuilder("Guide Set " + gs.getGuideSetId() + ": " + gs.getComment())
.href("#")
.attributes(Map.of(tabindex.name(), "-1"))
.onClick("createGuideSetWindow(" + bean.getProtocol().getRowId() + ", " + gs.getGuideSetId() + ", false)")
Expand Down
6 changes: 3 additions & 3 deletions ms2/src/org/labkey/ms2/MS2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@
import org.labkey.api.util.Formats;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.HtmlStringBuilder;
import org.labkey.api.util.Link.LinkBuilder;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.NetworkDrive;
import org.labkey.api.util.OptionBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.Pair;
import org.labkey.api.util.ReturnURLString;
import org.labkey.api.util.SafeToRenderEnum;
import org.labkey.api.util.SelectBuilder;
import org.labkey.api.util.StringUtilsLabKey;
import org.labkey.api.util.TestContext;
import org.labkey.api.util.URLHelper;
import org.labkey.api.util.element.Option.OptionBuilder;
import org.labkey.api.util.element.Select.SelectBuilder;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.DataView;
import org.labkey.api.view.GridView;
Expand Down
2 changes: 1 addition & 1 deletion ms2/src/org/labkey/ms2/ShowPeptideContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import org.labkey.api.data.Container;
import org.labkey.api.security.User;
import org.labkey.api.util.Link.LinkBuilder;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.view.ActionURL;

public class ShowPeptideContext
Expand Down
8 changes: 4 additions & 4 deletions ms2/src/org/labkey/ms2/ms2Admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@
</tr>
<tr class="labkey-alternate-row">
<td style="font-weight: bold;">Successful</td>
<td align="right"><%=link(bean.stats.get("successfulRuns"), bean.successfulURL).clearClasses()%></td>
<td align="right"><%=simpleLink(bean.stats.get("successfulRuns"), bean.successfulURL)%></td>
<td align="right"><%=h(bean.stats.get("successfulPeptides"))%></td>
<td align="right"><%=h(bean.stats.get("successfulSpectra"))%></td>
</tr>
<tr class="labkey-row">
<td style="font-weight: bold;">In-Process</td>
<td align="right"><%=link(bean.stats.get("inProcessRuns"), bean.inProcessURL).clearClasses()%></td>
<td align="right"><%=simpleLink(bean.stats.get("inProcessRuns"), bean.inProcessURL)%></td>
<td align="right"><%=h(bean.stats.get("inProcessPeptides"))%></td>
<td align="right"><%=h(bean.stats.get("inProcessSpectra"))%></td>
</tr>
<tr class="labkey-alternate-row">
<td style="font-weight: bold;">Failed</td>
<td align="right"><%=link(bean.stats.get("failedRuns"), bean.failedURL).clearClasses()%></td>
<td align="right"><%=simpleLink(bean.stats.get("failedRuns"), bean.failedURL)%></td>
<td align="right"><%=h(bean.stats.get("failedPeptides"))%></td>
<td align="right"><%=h(bean.stats.get("failedSpectra"))%></td>
</tr>
Expand All @@ -57,7 +57,7 @@
</tr>
<tr class="labkey-alternate-row">
<td style="font-weight: bold;">Deleted</td>
<td align="right"><%=link(bean.stats.get("deletedRuns"), bean.deletedURL).clearClasses()%></td>
<td align="right"><%=simpleLink(bean.stats.get("deletedRuns"), bean.deletedURL)%></td>
<td align="right"><%=h(bean.stats.get("deletedPeptides"))%></td>
<td align="right"><%=h(bean.stats.get("deletedSpectra"))%></td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion ms2/src/org/labkey/ms2/query/FilterView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.labkey.api.query.QueryParam;
import org.labkey.api.query.QuerySettings;
import org.labkey.api.query.QueryView;
import org.labkey.api.util.element.Select.SelectBuilder;
import org.labkey.api.util.SelectBuilder;
import org.labkey.api.view.ViewContext;
import org.labkey.ms2.MS2Controller;

Expand Down
4 changes: 2 additions & 2 deletions protein/api-src/org/labkey/api/protein/ProteinManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.labkey.api.query.FieldKey;
import org.labkey.api.util.HashHelpers;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.Link;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.view.NotFoundException;

import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -298,7 +298,7 @@ public static HtmlString makeFullAnchorLink(String url, String target, String tx
if (null == url)
return HtmlString.of(txt);

return new Link.LinkBuilder(txt).href(url).target(target).clearClasses().getHtmlString();
return new LinkBuilder(txt).href(url).target(target).clearClasses().getHtmlString();
Copy link
Contributor

@labkey-jeckels labkey-jeckels Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return new LinkBuilder(txt).href(url).target(target).clearClasses().getHtmlString();
return LinkBuilder.simpleLink(txt, url).target(target).getHtmlString();

Copy link
Contributor Author

@labkey-adam labkey-adam Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, simpleLink() takes String, URLHelper, so doesn't work here. I may add other variants, but not this round.

}

public static List<HtmlString> makeFullAnchorLinks(Collection<String> idents, String target, String identType)
Expand Down