Skip to content

Commit 385dab0

Browse files
labkey-adamlabkey-adam
authored
Improve display element builders (#541)
1 parent 9dcfceb commit 385dab0

20 files changed

+143
-146
lines changed

‎lincs/src/org/labkey/lincs/LincsController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import org.labkey.api.targetedms.TargetedMSService;
6767
import org.labkey.api.util.DOM;
6868
import org.labkey.api.util.FileUtil;
69-
import org.labkey.api.util.Link;
69+
import org.labkey.api.util.LinkBuilder;
7070
import org.labkey.api.util.PageFlowUtil;
7171
import org.labkey.api.util.URLHelper;
7272
import org.labkey.api.view.ActionURL;
@@ -1039,7 +1039,7 @@ public ModelAndView getSuccessView(ClueCredentialsForm form)
10391039
return new HtmlView(
10401040
DIV("Clue/PSP details saved!",
10411041
BR(),
1042-
new Link.LinkBuilder("Back to Project").href(projectUrl).build()
1042+
new LinkBuilder("Back to Project").href(projectUrl).build()
10431043
)
10441044
);
10451045
}
@@ -1125,7 +1125,7 @@ public ModelAndView getSuccessView(CromwellConfigForm cromwellConfigForm)
11251125
return new HtmlView(
11261126
DIV("Cromwell details saved!",
11271127
BR(),
1128-
new Link.LinkBuilder("Back to Project").href(projectUrl).build()
1128+
new LinkBuilder("Back to Project").href(projectUrl).build()
11291129
)
11301130
);
11311131
}

‎lincs/src/org/labkey/lincs/LincsDataTable.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.labkey.api.settings.AppProps;
3232
import org.labkey.api.util.FileUtil;
3333
import org.labkey.api.util.HtmlString;
34-
import org.labkey.api.util.Link;
34+
import org.labkey.api.util.LinkBuilder;
3535
import org.labkey.api.util.PageFlowUtil;
3636
import org.labkey.api.view.ActionURL;
3737
import org.labkey.api.writer.HtmlWriter;
@@ -87,9 +87,9 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
8787
// <span style="white-space: nowrap;"> is recommended instead of deprecated <nobr></nobr>
8888
SPAN(
8989
at(style, "white-space: nowrap;"),
90-
new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
90+
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
9191
HtmlString.NBSP,
92-
new Link.LinkBuilder("Skyline").href(docDetailsUrl).clearClasses()
92+
LinkBuilder.simpleLink("Skyline", docDetailsUrl)
9393
).appendTo(out);
9494
}
9595

@@ -158,7 +158,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
158158
ActionURL url = new ActionURL(LincsController.SubmitPspJobAction.class, getContainer());
159159
url.addParameter("runId", runId);
160160

161-
out.write(new Link.LinkBuilder(" [Submit Job]").href(url).usePost());
161+
out.write(new LinkBuilder(" [Submit Job]").href(url).usePost());
162162
}
163163
return;
164164
}
@@ -376,9 +376,9 @@ private void renderGridCell(HtmlWriter out, String analyticsScript, String downl
376376
SPAN(
377377
at(style, "white-space: nowrap;"),
378378
HtmlString.NBSP,
379-
new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
379+
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
380380
HtmlString.NBSP,
381-
new Link.LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
381+
new LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
382382
HtmlString.NBSP,
383383
morpheusUrl != null ? HtmlString.NBSP : null,
384384
morpheusUrl,

‎nextflow/src/org/labkey/nextflow/NextFlowController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import org.labkey.api.security.permissions.InsertPermission;
2424
import org.labkey.api.security.permissions.ReadPermission;
2525
import org.labkey.api.security.permissions.SiteAdminPermission;
26-
import org.labkey.api.util.Button;
26+
import org.labkey.api.util.ButtonBuilder;
2727
import org.labkey.api.util.DOM;
2828
import org.labkey.api.util.FileUtil;
2929
import org.labkey.api.util.HtmlString;
3030
import org.labkey.api.util.PageFlowUtil;
3131
import org.labkey.api.util.Path;
3232
import org.labkey.api.util.URLHelper;
33-
import org.labkey.api.util.element.Select;
33+
import org.labkey.api.util.SelectBuilder;
3434
import org.labkey.api.util.logging.LogHelper;
3535
import org.labkey.api.view.HtmlView;
3636
import org.labkey.api.view.JspView;
@@ -209,8 +209,8 @@ public ModelAndView getView(EnabledForm form, boolean reshow, BindException erro
209209
getContainer().isRoot() ?
210210
"Unset" :
211211
"Inherited from " + getContainer().getParent().getPath() + " (currently " + (NextFlowManager.get().isEnabled(getContainer().getParent()) ? "enabled" : "disabled") + ")"),
212-
new Button.ButtonBuilder("Save").submit(true).build(), " ",
213-
new Button.ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
212+
new ButtonBuilder("Save").submit(true).build(), " ",
213+
new ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
214214
}
215215
else
216216
{
@@ -293,9 +293,9 @@ public ModelAndView getView(AnalyzeForm o, boolean b, BindException errors)
293293
"Files: ",
294294
UL(Arrays.stream(inputFiles).map(File::getName).map(DOM::LI)),
295295
"Config: ",
296-
new Select.SelectBuilder().name("configFile").addOptions(Arrays.stream(configFiles).filter(f -> f.isFile() && f.getName().toLowerCase().endsWith(".config")).map(File::getName).sorted(String.CASE_INSENSITIVE_ORDER).toList()).build(),
296+
new SelectBuilder().name("configFile").addOptions(Arrays.stream(configFiles).filter(f -> f.isFile() && f.getName().toLowerCase().endsWith(".config")).map(File::getName).sorted(String.CASE_INSENSITIVE_ORDER).toList()).build(),
297297
DOM.BR(),
298-
new Button.ButtonBuilder("Start NextFlow").submit(true).build())));
298+
new ButtonBuilder("Start NextFlow").submit(true).build())));
299299
}
300300
}
301301
}

‎nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
2-
<%@ page import="org.labkey.api.view.HttpView" %>
3-
<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
4-
<%@ page import="org.labkey.api.util.Button" %>
5-
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
62
<%@ page import="org.labkey.api.admin.AdminUrls" %>
73
<%@ page import="org.labkey.api.security.permissions.AdminOperationsPermission" %>
4+
<%@ page import="org.labkey.api.util.ButtonBuilder" %>
5+
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
6+
<%@ page import="org.labkey.api.view.HttpView" %>
7+
<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
88
<%@ page extends="org.labkey.api.jsp.JspBase" %>
99
<%
1010
NextFlowConfiguration form = (NextFlowConfiguration) HttpView.currentModel();
@@ -38,9 +38,9 @@
3838
<td><labkey:input type="password" name="apiKey" id="apiKeyInput" size="64" placeholder='<%= form.getApiKey() != null ? "value already set, overwrite to replace" : "" %>' /></td>
3939
</tr>
4040
</table>
41-
<%= new Button.ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
42-
<%= new Button.ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
43-
<%= new Button.ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
41+
<%= new ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
42+
<%= new ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
43+
<%= new ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
4444
</labkey:form>
4545

4646
<script type="text/javascript" nonce="<%=getScriptNonce()%>">

0 commit comments

Comments
 (0)