Skip to content

Simplify and expand use of LinkBuilder factory methods #542

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

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
24 changes: 12 additions & 12 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@ a { text-decoration: none; }
<div style="float:left; width:351px;">
<img id="toolIcon" src="<%= h(tool.getIconUrl()) %>" class="logoWrap" alt="<%= h(tool.getName()) %>">
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().addClass("toolProperty").id("editIcon").title("Icon").onClick("editTool($(this), 'Icon')")%>
<%=simpleLink(editIconImgHtml).addClass("toolProperty").id("editIcon").title("Icon").onClick("editTool($(this), 'Icon')")%>
<% } %>
<div class="block">
<h2><%= h(tool.getName()) %></h2>
<p>
Version <%= h(tool.getVersion()) %>
<% if (allVersions.length > 1) { %>
[<%=link("View All").clearClasses().onClick("$('#allVersionsPop').dialog('open')")%>]
[<%=simpleLink("View All").onClick("$('#allVersionsPop').dialog('open')")%>]
</p>
<% } %>
</p>
Expand All @@ -429,14 +429,14 @@ a { text-decoration: none; }
<div class="menuMouseArea sprocket">
<img src="<%= h(imgDir) %>gear.png" title="Settings" alt="Sprocket" />
<ul class="dropMenu">
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPop').dialog('open')")%></li>
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#uploadSuppPop').dialog('open')")%></li>
<li><%=simpleLink("Upload new version").onClick("$('#uploadPop').dialog('open')")%></li>
<li><%=simpleLink("Upload supplementary file").onClick("$('#uploadSuppPop').dialog('open')")%></li>
<% if (multipleVersions) { %>
<li><%=link("Delete latest version").clearClasses().onClick("$('#delToolLatestDlg').dialog('open')")%></li>
<li><%=simpleLink("Delete latest version").onClick("$('#delToolLatestDlg').dialog('open')")%></li>
<% } %>
<% if (admin) { %>
<li><%=link("Delete").clearClasses().onClick("$('#delToolAllDlg').dialog('open')")%></li>
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners()")%></li>
<li><%=simpleLink("Delete").onClick("$('#delToolAllDlg').dialog('open')")%></li>
<li><%=simpleLink("Manage tool owners").onClick("popToolOwners()")%></li>
<% } %>
</ul>
</div>
Expand All @@ -445,7 +445,7 @@ a { text-decoration: none; }
<p id="toolDescription" class="toolProperty" title="Description">
<span class="toolPropertyValue"><%= h(tool.getDescription(), true) %></span>
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
<% } %>
</p>
<div id="downloadArea">
Expand Down Expand Up @@ -480,7 +480,7 @@ a { text-decoration: none; }
<span class="boldfont">Organization:</span>
<span class="toolPropertyValue"><%= h(tool.getOrganization()) %></span>
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
<% } %>
</div>
<% } %>
Expand All @@ -490,7 +490,7 @@ a { text-decoration: none; }
<span class="boldfont">Authors:</span>
<span class="toolPropertyValue"><%= h(tool.getAuthors()) %></span>
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'author')")%>
<%=simpleLink(editIconImgHtml).onClick("editTool($(this), 'author')")%>
<% } %>
</div>
<% } %>
Expand All @@ -500,7 +500,7 @@ a { text-decoration: none; }
<span class="boldfont">Languages:</span>
<span class="toolPropertyValue"><%= h(tool.getLanguages()) %></span>
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
<% } %>
</div>
<% } %>
Expand All @@ -510,7 +510,7 @@ a { text-decoration: none; }
<span class="boldfont">More Information:</span>
<a href="<%= h(tool.getProvider()) %>" target="_blank" rel="noopener noreferrer"><span class="toolPropertyValue"><%= h(tool.getProvider()) %></span></a>
<% if (toolEditor) { %>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'provider')")%>
<%=simpleLink(editIconImgHtml).onClick("editTool($(this), 'provider')")%>
<% } %>
</div>

Expand Down
12 changes: 6 additions & 6 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,14 @@
<div class="menuMouseArea sprocket" alt="<%= h(tool.getName()) %>">
<img src="<%= h(imgDir) %>gear.png" title="Settings" />
<ul class="dropMenu">
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPopOwners').hide(); $('#updatetarget').val(" + tool.getRowId() + "); $('#uploadPop').dialog('open')")%></li>
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#supptarget').val(" + tool.getRowId() + "); $('#uploadSuppPop').dialog('open')")%></li>
<li><%=simpleLink("Upload new version").onClick("$('#uploadPopOwners').hide(); $('#updatetarget').val(" + tool.getRowId() + "); $('#uploadPop').dialog('open')")%></li>
<li><%=simpleLink("Upload supplementary file").onClick("$('#supptarget').val(" + tool.getRowId() + "); $('#uploadSuppPop').dialog('open')")%></li>
<% if (multipleVersions) { %>
<li><%=link("Delete latest version").clearClasses().onClick("delToolLatest($(this))")%></li>
<li><%=simpleLink("Delete latest version").onClick("delToolLatest($(this))")%></li>
<% } %>
<% if (admin) { %>
<li><%=link("Delete").clearClasses().onClick("delToolAll($(this))")%></li>
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners(" + tool.getRowId() + ")")%></li>
<li><%=simpleLink("Delete").onClick("delToolAll($(this))")%></li>
<li><%=simpleLink("Manage tool owners").onClick("popToolOwners(" + tool.getRowId() + ")")%></li>
<% } %>
</ul>
</div>
Expand Down Expand Up @@ -349,7 +349,7 @@
<p>
<a href="<%= h(detailsUrl) %>">See all <%= totalReviews %> reviews</a>
<% if (loggedIn && !leftReview) { %>
<%=link("Leave review").clearClasses().onClick("$('#ratingToolId').val(" + tool.getRowId() + "); $('#reviewPop').dialog('open')")%>
<%=simpleLink("Leave review").onClick("$('#ratingToolId').val(" + tool.getRowId() + "); $('#reviewPop').dialog('open')")%>
<% } %>
</p>
</div>
Expand Down
8 changes: 4 additions & 4 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 @@ -1039,7 +1039,7 @@ public ModelAndView getSuccessView(ClueCredentialsForm form)
return new HtmlView(
DIV("Clue/PSP details saved!",
BR(),
new LinkBuilder("Back to Project").href(projectUrl).build()
LinkBuilder.labkeyLink("Back to Project", projectUrl).build()
)
);
}
Expand Down Expand Up @@ -1124,8 +1124,8 @@ public ModelAndView getSuccessView(CromwellConfigForm cromwellConfigForm)
ActionURL projectUrl = PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(getContainer());
return new HtmlView(
DIV("Cromwell details saved!",
BR(),
new LinkBuilder("Back to Project").href(projectUrl).build()
BR(),
LinkBuilder.labkeyLink("Back to Project", projectUrl).build()
)
);
}
Expand Down Expand Up @@ -1237,7 +1237,7 @@ public ModelAndView getView(LincsPspJobForm form, BindException errors)
if(pspJob.getPipelineJobId() != null && getUser().hasSiteAdminPermission())
{
ActionURL pipelineJobUrl = PageFlowUtil.urlProvider(PipelineStatusUrls.class).urlDetails(getContainer(), pspJob.getPipelineJobId());
view.addView(new HtmlView(PageFlowUtil.link("View Pipeline Job. Status: " + PipelineService.get().getStatusFile(pspJob.getPipelineJobId()).getStatus()).href(pipelineJobUrl)));
view.addView(new HtmlView(LinkBuilder.labkeyLink("View Pipeline Job. Status: " + PipelineService.get().getStatusFile(pspJob.getPipelineJobId()).getStatus(), pipelineJobUrl)));
}

view.setTitle("PSP Job Details");
Expand Down
10 changes: 5 additions & 5 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 @@ -87,7 +87,7 @@ 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 LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
LinkBuilder.labkeyLink("Download", downloadUrl).iconCls("fa fa-download"),
HtmlString.NBSP,
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 LinkBuilder(" [Submit Job]").href(url).usePost());
out.write(LinkBuilder.labkeyLink(" [Submit Job]", url).usePost());
}
return;
}
Expand All @@ -176,7 +176,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
}
ActionURL url = new ActionURL(LincsController.LincsPspJobDetailsAction.class, getContainer());
url.addParameter("runId", pspJob.getRunId());
out.write(PageFlowUtil.link(text).href(url));
out.write(LinkBuilder.labkeyLink(text, url));
}

@Override
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 LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
LinkBuilder.labkeyLink("Download", downloadUrl).iconCls("fa fa-download").onClick(analyticsScript),
HtmlString.NBSP,
new LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
LinkBuilder.simpleLink(downloadText, downloadUrl).onClick(analyticsScript),
HtmlString.NBSP,
morpheusUrl != null ? HtmlString.NBSP : null,
morpheusUrl,
Expand Down
Loading