Simplify and expand use of LinkBuilder factory methods (#251)

labkey-adam · web-flow · commit 876b10f686bb · 2025-04-14T15:49:51.000-07:00
diff --git a/mGAP/src/org/labkey/mgap/query/OMIMDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/OMIMDisplayColumnFactory.java
@@ -8,6 +8,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -59,7 +60,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     }
 
                     out.write(delim);
-                    out.write(PageFlowUtil.link(text).href("https://www.omim.org/entry/" + id).target("_blank").clearClasses());
+                    out.write(LinkBuilder.simpleLink(text, "https://www.omim.org/entry/" + id).target("_blank"));
                     delim = HtmlString.BR;
                 }
             }
diff --git a/mGAP/src/org/labkey/mgap/query/OMIMPhenotypeDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/OMIMPhenotypeDisplayColumnFactory.java
@@ -8,6 +8,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -68,11 +69,11 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     out.write(delim);
                     if (elements.length > 1)
                     {
-                        out.write(PageFlowUtil.link(elements[0]).target("_blank").href("https://www.omim.org/entry/" + elements[1]).clearClasses());
+                        out.write(LinkBuilder.simpleLink(elements[0], "https://www.omim.org/entry/" + elements[1]).target("_blank"));
                     }
                     else
                     {
-                        out.write(PageFlowUtil.link(elements[0]).clearClasses());
+                        out.write(LinkBuilder.simpleLink(elements[0]));
                     }
 
                     delim = HtmlString.BR;
diff --git a/mGAP/src/org/labkey/mgap/query/OverlappingGenesDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/OverlappingGenesDisplayColumnFactory.java
@@ -8,6 +8,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -66,7 +67,7 @@ else if (geneName.startsWith("ENSMMUE"))
                     }
 
                     out.write(delim);
-                    out.write(PageFlowUtil.link(geneName).href(url).target("_blank").clearClasses());
+                    out.write(LinkBuilder.simpleLink(geneName, url).target("_blank"));
                     delim = HtmlString.BR;
                 }
             }
diff --git a/mGAP/src/org/labkey/mgap/query/PhenotypeVariantLinkDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/PhenotypeVariantLinkDisplayColumnFactory.java
@@ -8,7 +8,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
-import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.List;
@@ -52,7 +52,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 if (releaseId != null && omim != null)
                 {
                     DetailsURL url = DetailsURL.fromString("/mgap/variantList.view?release=" + releaseId + "&query.omim_phenotype~contains=" + omim, ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("View Variants").href(url.getActionURL()).addClass("labkey-text-link"));
+                    out.write(LinkBuilder.labkeyLink("View Variants", url.getActionURL()));
                 }
             }
         };
diff --git a/mGAP/src/org/labkey/mgap/query/SourceDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/SourceDisplayColumnFactory.java
@@ -9,6 +9,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.writer.HtmlWriter;
 
@@ -66,7 +67,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 }
                 else
                 {
-                    out.write(PageFlowUtil.link(val).href(url).clearClasses());
+                    out.write(LinkBuilder.simpleLink(val, url));
                 }
             }
 
diff --git a/mGAP/src/org/labkey/mgap/query/TracksPerReleaseGenomeBrowserDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/TracksPerReleaseGenomeBrowserDisplayColumnFactory.java
@@ -5,6 +5,7 @@
 import org.labkey.api.data.DisplayColumn;
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.DetailsURL;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -28,7 +29,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 if (jbrowseId != null && trackName != null)
                 {
                     DetailsURL url = DetailsURL.fromString("/mgap/genomeBrowser.view?database=" + jbrowseId + "&activeTracks=" + trackName, ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("View In Genome Browser").addClass("labkey-text-link").href(url.getActionURL()));
+                    out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));
                 }
             }
         };
diff --git a/mGAP/src/org/labkey/mgap/query/VariantListJBrowseDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/VariantListJBrowseDisplayColumnFactory.java
@@ -12,7 +12,7 @@
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
-import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.writer.HtmlWriter;
 
 import java.util.List;
@@ -68,15 +68,15 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 if (jbrowseId != null)
                 {
                     DetailsURL url = DetailsURL.fromString("/jbrowse/browser.view?database=" + jbrowseId + "&location=" + contig + ":" + start + ".." + stop + "&highlight=" + contig + ":" + position + ".." + (position + length - 1), ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("View In Genome Browser").href(url.getActionURL()).addClass("labkey-text-link"));
+                    out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));
                     delim = HtmlString.BR;
                 }
 
                 if (primaryTrack != null)
                 {
                     out.write(delim);
                     DetailsURL url = DetailsURL.fromString("/jbrowse/genotypeTable.view?trackId=" + primaryTrack + "&chr=" + contig + "&start=" + position + "&stop=" + position, ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("View Genotypes At Position").href(url.getActionURL()).addClass("labkey-text-link"));
+                    out.write(LinkBuilder.labkeyLink("View Genotypes At Position", url.getActionURL()));
                     delim = HtmlString.BR;
                 }
 
@@ -98,7 +98,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                                 {
                                     String url = "https://www.ncbi.nlm.nih.gov/clinvar/variation/" + parts[1] + "/";
                                     out.write(delim);
-                                    out.write(PageFlowUtil.link("View in ClinVar").href(url));
+                                    out.write(LinkBuilder.labkeyLink("View in ClinVar", url));
                                     delim = HtmlString.BR;
                                 }
                             }
@@ -111,7 +111,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 contigE = contigE.replaceAll("^0", "");
                 String url = "https://ensembl.org/Macaca_mulatta/Location/View?db=core;r=" + contigE + ":" + start +"-" + stop;
                 out.write(delim);
-                out.write(PageFlowUtil.link("View Region in Ensembl").href(url));
+                out.write(LinkBuilder.labkeyLink("View Region in Ensembl", url));
             }
         };
     }
diff --git a/mGAP/src/org/labkey/mgap/query/VariantReleaseDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/VariantReleaseDisplayColumnFactory.java
@@ -10,6 +10,7 @@
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.HtmlString;
+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;
@@ -53,7 +54,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 Integer rowId = ctx.get(getBoundKey("rowid"), Integer.class);
                 if (rowId != null)
                 {
-                    out.write(PageFlowUtil.link("Download").
+                    out.write(LinkBuilder.labkeyLink("Download").
                             addClass("vrdc-row").
                             attributes(PageFlowUtil.map("data-rowid", rowId.toString()))
                     );
@@ -76,7 +77,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     }
 
                     DetailsURL url = DetailsURL.fromString("/jbrowse/browser.view?database=" + jbrowseId, ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("View In Genome Browser", url.getActionURL()));
+                    out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));
                 }
 
                 Boolean showVariantList = ctx.get(getBoundKey("hasSignificantVariants"), Boolean.class);
@@ -85,7 +86,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                     out.write(HtmlString.BR);
 
                     DetailsURL url = DetailsURL.fromString("/mgap/variantList.view?release=" + rowId, ContainerManager.getForId(containerId));
-                    out.write(PageFlowUtil.link("Significant Variant List", url.getActionURL()));
+                    out.write(LinkBuilder.labkeyLink("Significant Variant List", url.getActionURL()));
                 }
             }
 
diff --git a/mGAP/src/org/labkey/mgap/query/VariantReleaseGenomeBrowserDisplayColumnFactory.java b/mGAP/src/org/labkey/mgap/query/VariantReleaseGenomeBrowserDisplayColumnFactory.java
@@ -8,6 +8,7 @@
 import org.labkey.api.data.RenderContext;
 import org.labkey.api.query.DetailsURL;
 import org.labkey.api.query.FieldKey;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 
@@ -73,7 +74,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
             if (jbrowseId != null)
             {
                 DetailsURL url = DetailsURL.fromString("/jbrowse/browser.view?database=" + jbrowseId, ContainerManager.getForId(containerId));
-                out.write(PageFlowUtil.link("View In Genome Browser", url.getActionURL()));
+                out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));
             }
         }
 
diff --git a/mcc/src/org/labkey/mcc/query/AnimalRequestActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/AnimalRequestActionsDisplayColumnFactory.java
@@ -5,6 +5,7 @@
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DisplayColumn;
 import org.labkey.api.data.DisplayColumnFactory;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.api.data.RenderContext;
@@ -26,7 +27,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
             public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
             {
                 int rowId = ctx.get(getBoundKey("rowid"), Integer.class);
-                out.write(PageFlowUtil.link("Contact MCC").href("mailto:" + MccManager.get().getMccAdminEmail() + "?subject=MCC Request #" + rowId));
+                out.write(LinkBuilder.labkeyLink("Contact MCC", "mailto:" + MccManager.get().getMccAdminEmail() + "?subject=MCC Request #" + rowId));
             }
 
             @Override
diff --git a/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestReviewActionsDisplayColumnFactory.java
@@ -11,7 +11,7 @@
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
-import org.labkey.api.util.PageFlowUtil;
+import org.labkey.api.util.LinkBuilder;
 import org.labkey.api.writer.HtmlWriter;
 import org.labkey.mcc.MccManager;
 
@@ -44,7 +44,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                 String requestId = ctx.get(getBoundKey("requestId"), String.class);
                 Container requestContainer = MccManager.get().getMCCRequestContainer(ctx.getContainer());
                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=rabReview", requestContainer);
-                out.write(PageFlowUtil.link("Enter Review").href(url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())).addClass("labkey-text-link"));
+                out.write(LinkBuilder.labkeyLink("Enter Review", url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
             }
 
             @Override
diff --git a/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java b/mcc/src/org/labkey/mcc/query/RequestScoreActionsDisplayColumnFactory.java
@@ -13,6 +13,7 @@
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.util.HtmlString;
+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;
@@ -49,7 +50,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                         return;
                     }
 
-                    out.write(PageFlowUtil.link("Contact Investigator").addClass("labkey-text-link").href("mailto:" + u.getEmail() + "?subject=MCC Request #" + requestRowId));
+                    out.write(LinkBuilder.labkeyLink("Contact Investigator", "mailto:" + u.getEmail() + "?subject=MCC Request #" + requestRowId));
                 }
 
                 String status = ctx.get(getBoundKey("requestId", "status"), String.class);
@@ -77,7 +78,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=primaryReview", requestContainer);
                                 out.write(HtmlString.BR);
-                                out.write(PageFlowUtil.link("Enter MCC Internal Review").addClass("labkey-text-link").href(url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
+                                out.write(LinkBuilder.labkeyLink("Enter MCC Internal Review", url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
                             }
                         }
                         else if (st == MccManager.RequestStatus.RabReview && ctx.get(FieldKey.fromString("pendingRabReviews"), Integer.class) == 0)
@@ -86,7 +87,7 @@ else if (st == MccManager.RequestStatus.RabReview && ctx.get(FieldKey.fromString
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=resourceAvailability", requestContainer);
                                 out.write(HtmlString.BR);
-                                out.write(PageFlowUtil.link("Enter Resource Availability Assessment").addClass("labkey-text-link").href(url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
+                                out.write(LinkBuilder.labkeyLink("Enter Resource Availability Assessment", url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
                             }
                         }
                         else if (st == MccManager.RequestStatus.PendingDecision)
@@ -95,16 +96,17 @@ else if (st == MccManager.RequestStatus.PendingDecision)
                             {
                                 DetailsURL url = DetailsURL.fromString("/mcc/requestReview.view?requestId=" + requestId + "&mode=finalReview", requestContainer);
                                 out.write(HtmlString.BR);
-                                out.write(PageFlowUtil.link("Enter Final Review").addClass("labkey-text-link").href(url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
+                                out.write(LinkBuilder.labkeyLink("Enter Final Review", url.getActionURL().addReturnUrl(ctx.getViewContext().getActionURL())));
                             }
                         }
                         else if (st == MccManager.RequestStatus.Approved)
                         {
                             out.write(HtmlString.BR);
-                            out.write(PageFlowUtil.link("Mark Fulfilled").
+                            out.write(LinkBuilder.labkeyLink("Mark Fulfilled").
                                     addClass("labkey-text-link").
                                     addClass("rsadc-approved").
-                                    attributes(PageFlowUtil.map("data-requestrowid", String.valueOf(requestRowId))));
+                                    attributes(PageFlowUtil.map("data-requestrowid", String.valueOf(requestRowId)))
+                            );
 
                             if (!_hasRegisteredApprovedHandler)
                             {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import org.labkey.api.data.RenderContext;`
`9`	`9`	`import org.labkey.api.query.FieldKey;`
`10`	`10`	`import org.labkey.api.util.HtmlString;`
	`11`	`+import org.labkey.api.util.LinkBuilder;`
`11`	`12`	`import org.labkey.api.util.PageFlowUtil;`
`12`	`13`	`import org.labkey.api.writer.HtmlWriter;`
`13`	`14`
`@@ -59,7 +60,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`out.write(delim);`
`62`		`- out.write(PageFlowUtil.link(text).href("https://www.omim.org/entry/" + id).target("_blank").clearClasses());`
	`63`	`+ out.write(LinkBuilder.simpleLink(text, "https://www.omim.org/entry/" + id).target("_blank"));`
`63`	`64`	`delim = HtmlString.BR;`
`64`	`65`	`}`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import org.labkey.api.data.RenderContext;`
`9`	`9`	`import org.labkey.api.query.DetailsURL;`
`10`	`10`	`import org.labkey.api.query.FieldKey;`
`11`		`-import org.labkey.api.util.PageFlowUtil;`
	`11`	`+import org.labkey.api.util.LinkBuilder;`
`12`	`12`	`import org.labkey.api.writer.HtmlWriter;`
`13`	`13`
`14`	`14`	`import java.util.List;`
`@@ -52,7 +52,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`52`	`52`	`if (releaseId != null && omim != null)`
`53`	`53`	`{`
`54`	`54`	`DetailsURL url = DetailsURL.fromString("/mgap/variantList.view?release=" + releaseId + "&query.omim_phenotype~contains=" + omim, ContainerManager.getForId(containerId));`
`55`		`- out.write(PageFlowUtil.link("View Variants").href(url.getActionURL()).addClass("labkey-text-link"));`
	`55`	`+ out.write(LinkBuilder.labkeyLink("View Variants", url.getActionURL()));`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import org.labkey.api.data.DisplayColumnFactory;`
`10`	`10`	`import org.labkey.api.data.RenderContext;`
`11`	`11`	`import org.labkey.api.query.FieldKey;`
	`12`	`+import org.labkey.api.util.LinkBuilder;`
`12`	`13`	`import org.labkey.api.util.PageFlowUtil;`
`13`	`14`	`import org.labkey.api.writer.HtmlWriter;`
`14`	`15`
`@@ -66,7 +67,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`66`	`67`	`}`
`67`	`68`	`else`
`68`	`69`	`{`
`69`		`- out.write(PageFlowUtil.link(val).href(url).clearClasses());`
	`70`	`+ out.write(LinkBuilder.simpleLink(val, url));`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import org.labkey.api.data.DisplayColumn;`
`6`	`6`	`import org.labkey.api.data.RenderContext;`
`7`	`7`	`import org.labkey.api.query.DetailsURL;`
	`8`	`+import org.labkey.api.util.LinkBuilder;`
`8`	`9`	`import org.labkey.api.util.PageFlowUtil;`
`9`	`10`	`import org.labkey.api.writer.HtmlWriter;`
`10`	`11`
`@@ -28,7 +29,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`28`	`29`	`if (jbrowseId != null && trackName != null)`
`29`	`30`	`{`
`30`	`31`	`DetailsURL url = DetailsURL.fromString("/mgap/genomeBrowser.view?database=" + jbrowseId + "&activeTracks=" + trackName, ContainerManager.getForId(containerId));`
`31`		`- out.write(PageFlowUtil.link("View In Genome Browser").addClass("labkey-text-link").href(url.getActionURL()));`
	`32`	`+ out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`};`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`import org.labkey.api.query.DetailsURL;`
`13`	`13`	`import org.labkey.api.query.FieldKey;`
`14`	`14`	`import org.labkey.api.util.HtmlString;`
`15`		`-import org.labkey.api.util.PageFlowUtil;`
	`15`	`+import org.labkey.api.util.LinkBuilder;`
`16`	`16`	`import org.labkey.api.writer.HtmlWriter;`
`17`	`17`
`18`	`18`	`import java.util.List;`
`@@ -68,15 +68,15 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`68`	`68`	`if (jbrowseId != null)`
`69`	`69`	`{`
`70`	`70`	`DetailsURL url = DetailsURL.fromString("/jbrowse/browser.view?database=" + jbrowseId + "&location=" + contig + ":" + start + ".." + stop + "&highlight=" + contig + ":" + position + ".." + (position + length - 1), ContainerManager.getForId(containerId));`
`71`		`- out.write(PageFlowUtil.link("View In Genome Browser").href(url.getActionURL()).addClass("labkey-text-link"));`
	`71`	`+ out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));`
`72`	`72`	`delim = HtmlString.BR;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (primaryTrack != null)`
`76`	`76`	`{`
`77`	`77`	`out.write(delim);`
`78`	`78`	`DetailsURL url = DetailsURL.fromString("/jbrowse/genotypeTable.view?trackId=" + primaryTrack + "&chr=" + contig + "&start=" + position + "&stop=" + position, ContainerManager.getForId(containerId));`
`79`		`- out.write(PageFlowUtil.link("View Genotypes At Position").href(url.getActionURL()).addClass("labkey-text-link"));`
	`79`	`+ out.write(LinkBuilder.labkeyLink("View Genotypes At Position", url.getActionURL()));`
`80`	`80`	`delim = HtmlString.BR;`
`81`	`81`	`}`
`82`	`82`
`@@ -98,7 +98,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`98`	`98`	`{`
`99`	`99`	`String url = "https://www.ncbi.nlm.nih.gov/clinvar/variation/" + parts[1] + "/";`
`100`	`100`	`out.write(delim);`
`101`		`- out.write(PageFlowUtil.link("View in ClinVar").href(url));`
	`101`	`+ out.write(LinkBuilder.labkeyLink("View in ClinVar", url));`
`102`	`102`	`delim = HtmlString.BR;`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -111,7 +111,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`111`	`111`	`contigE = contigE.replaceAll("^0", "");`
`112`	`112`	`String url = "https://ensembl.org/Macaca_mulatta/Location/View?db=core;r=" + contigE + ":" + start +"-" + stop;`
`113`	`113`	`out.write(delim);`
`114`		`- out.write(PageFlowUtil.link("View Region in Ensembl").href(url));`
	`114`	`+ out.write(LinkBuilder.labkeyLink("View Region in Ensembl", url));`
`115`	`115`	`}`
`116`	`116`	`};`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import org.labkey.api.query.DetailsURL;`
`11`	`11`	`import org.labkey.api.query.FieldKey;`
`12`	`12`	`import org.labkey.api.util.HtmlString;`
	`13`	`+import org.labkey.api.util.LinkBuilder;`
`13`	`14`	`import org.labkey.api.util.PageFlowUtil;`
`14`	`15`	`import org.labkey.api.view.HttpView;`
`15`	`16`	`import org.labkey.api.view.template.ClientDependency;`
`@@ -53,7 +54,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`53`	`54`	`Integer rowId = ctx.get(getBoundKey("rowid"), Integer.class);`
`54`	`55`	`if (rowId != null)`
`55`	`56`	`{`
`56`		`- out.write(PageFlowUtil.link("Download").`
	`57`	`+ out.write(LinkBuilder.labkeyLink("Download").`
`57`	`58`	`addClass("vrdc-row").`
`58`	`59`	`attributes(PageFlowUtil.map("data-rowid", rowId.toString()))`
`59`	`60`	`);`
`@@ -76,7 +77,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`DetailsURL url = DetailsURL.fromString("/jbrowse/browser.view?database=" + jbrowseId, ContainerManager.getForId(containerId));`
`79`		`- out.write(PageFlowUtil.link("View In Genome Browser", url.getActionURL()));`
	`80`	`+ out.write(LinkBuilder.labkeyLink("View In Genome Browser", url.getActionURL()));`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`Boolean showVariantList = ctx.get(getBoundKey("hasSignificantVariants"), Boolean.class);`
`@@ -85,7 +86,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)`
`85`	`86`	`out.write(HtmlString.BR);`
`86`	`87`
`87`	`88`	`DetailsURL url = DetailsURL.fromString("/mgap/variantList.view?release=" + rowId, ContainerManager.getForId(containerId));`
`88`		`- out.write(PageFlowUtil.link("Significant Variant List", url.getActionURL()));`
	`89`	`+ out.write(LinkBuilder.labkeyLink("Significant Variant List", url.getActionURL()));`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`