Skip to content

Improve display element builders #541

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 #541

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
10f7ece
Improve display element builders
labkey-adam Apr 11, 2025
9d526f2
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
6 changes: 3 additions & 3 deletions lincs/src/org/labkey/lincs/LincsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
import org.labkey.api.targetedms.TargetedMSService;
import org.labkey.api.util.DOM;
import org.labkey.api.util.FileUtil;
import org.labkey.api.util.Link;
import org.labkey.api.util.LinkBuilder;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.URLHelper;
import org.labkey.api.view.ActionURL;
Expand Down Expand Up @@ -1039,7 +1039,7 @@ public ModelAndView getSuccessView(ClueCredentialsForm form)
return new HtmlView(
DIV("Clue/PSP details saved!",
BR(),
new Link.LinkBuilder("Back to Project").href(projectUrl).build()
new LinkBuilder("Back to Project").href(projectUrl).build()
)
);
}
Expand Down Expand Up @@ -1125,7 +1125,7 @@ public ModelAndView getSuccessView(CromwellConfigForm cromwellConfigForm)
return new HtmlView(
DIV("Cromwell details saved!",
BR(),
new Link.LinkBuilder("Back to Project").href(projectUrl).build()
new LinkBuilder("Back to Project").href(projectUrl).build()
)
);
}
Expand Down
12 changes: 6 additions & 6 deletions lincs/src/org/labkey/lincs/LincsDataTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.labkey.api.settings.AppProps;
import org.labkey.api.util.FileUtil;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.Link;
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 @@ -87,9 +87,9 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
// <span style="white-space: nowrap;"> is recommended instead of deprecated <nobr></nobr>
SPAN(
at(style, "white-space: nowrap;"),
new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
HtmlString.NBSP,
new Link.LinkBuilder("Skyline").href(docDetailsUrl).clearClasses()
LinkBuilder.simpleLink("Skyline", docDetailsUrl)
).appendTo(out);
}

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

out.write(new Link.LinkBuilder(" [Submit Job]").href(url).usePost());
out.write(new LinkBuilder(" [Submit Job]").href(url).usePost());
}
return;
}
Expand Down Expand Up @@ -376,9 +376,9 @@ private void renderGridCell(HtmlWriter out, String analyticsScript, String downl
SPAN(
at(style, "white-space: nowrap;"),
HtmlString.NBSP,
new Link.LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
HtmlString.NBSP,
new Link.LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
new LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
HtmlString.NBSP,
morpheusUrl != null ? HtmlString.NBSP : null,
morpheusUrl,
Expand Down
12 changes: 6 additions & 6 deletions nextflow/src/org/labkey/nextflow/NextFlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.security.permissions.SiteAdminPermission;
import org.labkey.api.util.Button;
import org.labkey.api.util.ButtonBuilder;
import org.labkey.api.util.DOM;
import org.labkey.api.util.FileUtil;
import org.labkey.api.util.HtmlString;
import org.labkey.api.util.PageFlowUtil;
import org.labkey.api.util.Path;
import org.labkey.api.util.URLHelper;
import org.labkey.api.util.element.Select;
import org.labkey.api.util.SelectBuilder;
import org.labkey.api.util.logging.LogHelper;
import org.labkey.api.view.HtmlView;
import org.labkey.api.view.JspView;
Expand Down Expand Up @@ -209,8 +209,8 @@ public ModelAndView getView(EnabledForm form, boolean reshow, BindException erro
getContainer().isRoot() ?
"Unset" :
"Inherited from " + getContainer().getParent().getPath() + " (currently " + (NextFlowManager.get().isEnabled(getContainer().getParent()) ? "enabled" : "disabled") + ")"),
new Button.ButtonBuilder("Save").submit(true).build(), " ",
new Button.ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
new ButtonBuilder("Save").submit(true).build(), " ",
new ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
}
else
{
Expand Down Expand Up @@ -293,9 +293,9 @@ public ModelAndView getView(AnalyzeForm o, boolean b, BindException errors)
"Files: ",
UL(Arrays.stream(inputFiles).map(File::getName).map(DOM::LI)),
"Config: ",
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(),
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(),
DOM.BR(),
new Button.ButtonBuilder("Start NextFlow").submit(true).build())));
new ButtonBuilder("Start NextFlow").submit(true).build())));
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions nextflow/src/org/labkey/nextflow/nextFlowConfiguration.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
<%@ page import="org.labkey.api.util.Button" %>
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
<%@ page import="org.labkey.api.admin.AdminUrls" %>
<%@ page import="org.labkey.api.security.permissions.AdminOperationsPermission" %>
<%@ page import="org.labkey.api.util.ButtonBuilder" %>
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.nextflow.NextFlowConfiguration" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
<%
NextFlowConfiguration form = (NextFlowConfiguration) HttpView.currentModel();
Expand Down Expand Up @@ -38,9 +38,9 @@
<td><labkey:input type="password" name="apiKey" id="apiKeyInput" size="64" placeholder='<%= form.getApiKey() != null ? "value already set, overwrite to replace" : "" %>' /></td>
</tr>
</table>
<%= new Button.ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
<%= new Button.ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
<%= new Button.ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
<%= new ButtonBuilder("Save").submit(true).primary(true).enabled(hasAdminOpsPerms) %>
<%= new ButtonBuilder("Delete").onClick("deleteConfig()").enabled(hasAdminOpsPerms) %>
<%= new ButtonBuilder("Cancel").href(PageFlowUtil.urlProvider(AdminUrls.class).getAdminConsoleURL()) %>
</labkey:form>

<script type="text/javascript" nonce="<%=getScriptNonce()%>">
Expand Down
Loading