Skip to content

Commit 531c5ed

Browse files
labkey-adamlabkey-adam
authored
lk-region-form -> data-region-form (#214)
1 parent 6f6559f commit 531c5ed

4 files changed

Lines changed: 45 additions & 43 deletions

File tree

‎hdrl/src/org/labkey/hdrl/query/HDRLQuerySchema.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.labkey.api.util.PageFlowUtil;
4646
import org.labkey.api.view.ActionURL;
4747
import org.labkey.api.view.ViewContext;
48+
import org.labkey.api.writer.HtmlWriter;
4849
import org.labkey.hdrl.HDRLController;
4950
import org.labkey.hdrl.HDRLManager;
5051
import org.labkey.hdrl.HDRLModule;
@@ -198,7 +199,7 @@ protected void addDetailsAndUpdateColumns(List<DisplayColumn> ret, TableInfo tab
198199
SimpleDisplayColumn actionColumn = new SimpleDisplayColumn()
199200
{
200201
@Override
201-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
202+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
202203
{
203204
Container c = ContainerManager.getForId(ctx.get(FieldKey.fromParts("container")).toString());
204205

@@ -215,13 +216,13 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
215216
{
216217
FieldKey requestFieldKey = FieldKey.fromParts("RequestId");
217218
ActionURL actionUrl = new ActionURL(HDRLController.EditRequestAction.class, c).addParameter("requestId", (Integer)ctx.get(requestFieldKey));
218-
out.write(PageFlowUtil.link("Edit").href(actionUrl).toString());
219+
oldWriter.write(PageFlowUtil.link("Edit").href(actionUrl).toString());
219220
}
220221
else
221222
{
222223
ActionURL actionUrl = new ActionURL(HDRLController.RequestDetailsAction.class, c);
223224
actionUrl.addParameter("requestId", (Integer) ctx.get("requestId"));
224-
out.write(PageFlowUtil.link("View").href(actionUrl).toString());
225+
oldWriter.write(PageFlowUtil.link("View").href(actionUrl).toString());
225226
}
226227
}
227228
};
@@ -248,13 +249,13 @@ protected void addDetailsAndUpdateColumns(List<DisplayColumn> ret, TableInfo tab
248249
SimpleDisplayColumn downloadColumn = new SimpleDisplayColumn()
249250
{
250251
@Override
251-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
252+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
252253
{
253254
Integer specimenId = (Integer) ctx.get(FieldKey.fromParts("RowId"));
254255
if (HDRLManager.get().hasClinicalReport(specimenId, getUser(), getContainer()))
255256
{
256257
// download button displayed
257-
out.write(PageFlowUtil.button("Download").href(new ActionURL(HDRLController.DownloadClinicalReportAction.class, getContainer()).addParameter("specimenId", specimenId)).toString());
258+
oldWriter.write(PageFlowUtil.button("Download").href(new ActionURL(HDRLController.DownloadClinicalReportAction.class, getContainer()).addParameter("specimenId", specimenId)).toString());
258259
}
259260
}
260261
};

‎pepdb/src/org/scharp/atlas/pepdb/PepDBBaseController.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.labkey.api.util.HtmlStringBuilder;
2020
import org.labkey.api.util.Link;
2121
import org.labkey.api.view.ActionURL;
22+
import org.labkey.api.writer.HtmlWriter;
2223
import org.scharp.atlas.pepdb.model.PeptideGroup;
2324
import org.scharp.atlas.pepdb.model.PeptidePool;
2425
import org.scharp.atlas.pepdb.model.Peptides;
@@ -440,7 +441,7 @@ public DCpeptideId(ColumnInfo col)
440441
}
441442

442443
@Override
443-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
444+
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
444445
{
445446
ColumnInfo c = getColumnInfo();
446447
Map rowMap = ctx.getRow();
@@ -452,17 +453,16 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
452453
try
453454
{
454455
new Link.LinkBuilder("P" + peptideId).clearClasses()
455-
.target("_self")
456-
.href(new ActionURL(PepDBController.DisplayPeptideAction.class, getContainer())
457-
.addParameter(PepDBSchema.COLUMN_PEPTIDE_ID, peptideId))
458-
.build()
459-
.appendTo(out);
456+
.target("_self")
457+
.href(new ActionURL(PepDBController.DisplayPeptideAction.class, getContainer())
458+
.addParameter(PepDBSchema.COLUMN_PEPTIDE_ID, peptideId))
459+
.build()
460+
.appendTo(out);
460461
}
461462
catch (Exception e)
462463
{
463464
e.printStackTrace();
464465
}
465-
466466
}
467467
}
468468

@@ -497,13 +497,13 @@ public Object getDisplayValue(RenderContext ctx)
497497
}
498498

499499
@Override
500-
public Class getValueClass()
500+
public Class<Integer> getValueClass()
501501
{
502502
return Integer.class;
503503
}
504504

505505
@Override
506-
public Class getDisplayValueClass()
506+
public Class<String> getDisplayValueClass()
507507
{
508508
return String.class;
509509
}
@@ -517,7 +517,7 @@ public DCpeptidePoolId(ColumnInfo col)
517517
}
518518

519519
@Override
520-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
520+
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
521521
{
522522
ColumnInfo c = getColumnInfo();
523523
Map rowMap = ctx.getRow();
@@ -529,11 +529,11 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
529529
try
530530
{
531531
new Link.LinkBuilder("PP" + peptidePoolId).clearClasses()
532-
.target("_self")
533-
.href(new ActionURL(PepDBController.DisplayPeptidePoolInformationAction.class, getContainer())
534-
.addParameter(PepDBSchema.COLUMN_PEPTIDE_POOL_ID, peptidePoolId))
535-
.build()
536-
.appendTo(out);
532+
.target("_self")
533+
.href(new ActionURL(PepDBController.DisplayPeptidePoolInformationAction.class, getContainer())
534+
.addParameter(PepDBSchema.COLUMN_PEPTIDE_POOL_ID, peptidePoolId))
535+
.build()
536+
.appendTo(out);
537537
}
538538
catch (Exception e)
539539
{
@@ -593,7 +593,7 @@ public DCparentPoolId(ColumnInfo col)
593593
}
594594

595595
@Override
596-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
596+
public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
597597
{
598598
ColumnInfo c = getColumnInfo();
599599
Map rowMap = ctx.getRow();
@@ -607,11 +607,11 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
607607
if(parentPoolId != null)
608608
{
609609
new Link.LinkBuilder("PP" + parentPoolId).clearClasses()
610-
.target("_self")
611-
.href(new ActionURL(PepDBController.DisplayPeptidePoolInformationAction.class, getContainer())
612-
.addParameter(PepDBSchema.COLUMN_PEPTIDE_POOL_ID, parentPoolId))
613-
.build()
614-
.appendTo(out);
610+
.target("_self")
611+
.href(new ActionURL(PepDBController.DisplayPeptidePoolInformationAction.class, getContainer())
612+
.addParameter(PepDBSchema.COLUMN_PEPTIDE_POOL_ID, parentPoolId))
613+
.build()
614+
.appendTo(out);
615615
}
616616
}
617617
catch (Exception e)
@@ -634,9 +634,9 @@ public Object getDisplayValue(RenderContext ctx)
634634
try
635635
{
636636
if (parentPoolId != null)
637-
return ("PP" + parentPoolId);
637+
return ("PP" + parentPoolId);
638638
else
639-
return null;
639+
return null;
640640
}
641641
catch (Exception e)
642642
{

‎pepdb/test/src/org/labkey/test/tests/pepdb/PepDBModuleTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,21 @@ public void testSteps() throws Exception
162162
// Select a newly uploaded peptide, #3 and edit it to have a storage location of 'Kitchen Sink'
163163
clickAndWait(Locator.linkWithText(pepString(4)));
164164
// Verify the expected record's content
165-
assertTrue(getDriver().findElement(Locator.xpath("//form[@lk-region-form='peptides']/table/tbody")).getText().matches("^[\\s\\S]*Peptide Id:\\s*" + pepString(4) + "\nPeptide Sequence:\\s*REPRGSDIAGTTSTL\nProtein Category:\\s*p24\nSequence Length:\\s*15\nAAStart:\\s*97\nAAEnd:\\s*111\nIs Child:\\s*false\nIs Parent:\\s*false[\\s\\S]*$"));
165+
assertTrue(getDriver().findElement(Locator.xpath("//form[@data-region-form='peptides']/table/tbody")).getText().matches("^[\\s\\S]*Peptide Id:\\s*" + pepString(4) + "\nPeptide Sequence:\\s*REPRGSDIAGTTSTL\nProtein Category:\\s*p24\nSequence Length:\\s*15\nAAStart:\\s*97\nAAEnd:\\s*111\nIs Child:\\s*false\nIs Parent:\\s*false[\\s\\S]*$"));
166166

167167
clickAndWait(Locator.linkWithText("Edit Peptide"));
168168
setFormElement(Locator.name("storage_location"), "Kitchen Sink");
169169
clickAndWait(Locator.xpath("//span[text()='Save Changes']"));
170170

171171
// Assert that the Storage Location now contains "Kitchen Sink"
172-
assertTrue(getDriver().findElement(Locator.xpath("//form[@lk-region-form='peptides']/table/tbody")).getText().matches("^[\\s\\S]*Peptide Id:\\s*" + pepString(4) + "\nPeptide Sequence:\\s*REPRGSDIAGTTSTL\nProtein Category:\\s*p24\nSequence Length:\\s*15\nAAStart:\\s*97\nAAEnd:\\s*111\nIs Child:\\s*false\nIs Parent:\\s*false[\\s\\S]*$"));
172+
assertTrue(getDriver().findElement(Locator.xpath("//form[@data-region-form='peptides']/table/tbody")).getText().matches("^[\\s\\S]*Peptide Id:\\s*" + pepString(4) + "\nPeptide Sequence:\\s*REPRGSDIAGTTSTL\nProtein Category:\\s*p24\nSequence Length:\\s*15\nAAStart:\\s*97\nAAEnd:\\s*111\nIs Child:\\s*false\nIs Parent:\\s*false[\\s\\S]*$"));
173173
clickAndWait(Locator.css("a.labkey-button > span"));
174174

175175
// Search for a single, newly-uploaded peptide and verify it displays as expected.
176176
setFormElement(Locator.name("peptide_id"), Integer.toString(peptideStartIndex + 9));
177177
clickButton("Find");
178178
// Verify the expected record's content
179-
assertTrue(getDriver().findElement(Locator.tagWithAttribute("form", "lk-region-form", "peptides")).getText()
179+
assertTrue(getDriver().findElement(Locator.tagWithAttribute("form", "data-region-form", "peptides")).getText()
180180
.matches("^[\\s\\S]*Peptide Id:\\s*" + pepString(9) + "\nPeptide Sequence:\\s*KCGKEGHQMKDCTER\nProtein Category:\\s*p2p7p1p6\nSequence Length:\\s*15\nAAStart:\\s*52\nAAEnd:\\s*66\nIs Child:\\s*false\nIs Parent:\\s*false\nStorage Location:\\s*\n[\\s\\S]*$"));
181181

182182
clickAndWait(Locator.css("a.labkey-button > span"));
@@ -199,8 +199,8 @@ public void testSteps() throws Exception
199199
clickAndWait(Locator.name("action_type"));
200200
clickAndWait(Locator.linkWithText(pepString(4)));
201201

202-
checker().verifyEquals("", "Peptide Sequence:", getDriver().findElement(Locator.xpath("//form[@lk-region-form='peptides']/table/tbody/tr[2]/td")).getText());
203-
checker().verifyEquals("", "REPRGSDIAGTTSTL", getDriver().findElement(Locator.xpath("//form[@lk-region-form='peptides']/table/tbody/tr[2]/td[2]")).getText());
202+
checker().verifyEquals("", "Peptide Sequence:", getDriver().findElement(Locator.xpath("//form[@data-region-form='peptides']/table/tbody/tr[2]/td")).getText());
203+
checker().verifyEquals("", "REPRGSDIAGTTSTL", getDriver().findElement(Locator.xpath("//form[@data-region-form='peptides']/table/tbody/tr[2]/td[2]")).getText());
204204
checker().verifyEquals("", "gagptegprac (PEPTIDE NUMBER =GAG1-4)", getDriver().findElement(Locator.css(".lk-body-ct div:nth-of-type(2) > table > tbody > tr > td")).getText());
205205
}
206206

‎viscstudies/src/org/labkey/viscstudies/DatasetListWithStatusColumn.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.labkey.api.study.Study;
2929
import org.labkey.api.study.StudyService;
3030
import org.labkey.api.util.PageFlowUtil;
31+
import org.labkey.api.writer.HtmlWriter;
3132

3233
import java.io.IOException;
3334
import java.io.Writer;
@@ -81,35 +82,35 @@ private List<? extends Dataset> getDatasets(RenderContext ctx)
8182
}
8283

8384
@Override
84-
public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
85+
public void renderGridCellContents(RenderContext ctx, Writer oldWriter, HtmlWriter out) throws IOException
8586
{
8687
// Show an icon for the dataset status (if set) and the dataset name, one per row, in a table
87-
out.write("<table>");
88+
oldWriter.write("<table>");
8889
for (Dataset dataset : getDatasets(ctx))
8990
{
9091
Object status = ReportPropsManager.get().getPropertyValue(dataset.getEntityId(), dataset.getContainer(), DataViewProvider.EditInfo.Property.status.toString());
91-
out.write("<tr><td style=\"width: 16px; border-style: none\">");
92+
oldWriter.write("<tr><td style=\"width: 16px; border-style: none\">");
9293
if (status == null || "None".equalsIgnoreCase(status.toString()))
9394
{
94-
out.write("&nbsp;");
95+
oldWriter.write("&nbsp;");
9596
}
9697
else
9798
{
9899
String iconPath = ICON_PATHS.get(status.toString());
99100
if (iconPath != null)
100101
{
101-
out.write("<img src=\"" + PageFlowUtil.filter(iconPath) + "\" height=\"16px\" width=\"16px\" />");
102+
oldWriter.write("<img src=\"" + PageFlowUtil.filter(iconPath) + "\" height=\"16px\" width=\"16px\" />");
102103
}
103104
else
104105
{
105-
out.write(PageFlowUtil.filter(status));
106+
oldWriter.write(PageFlowUtil.filter(status));
106107
}
107108
}
108-
out.write("</td><td style=\"border-style: none\">");
109-
out.write(PageFlowUtil.filter(dataset.getLabel()));
110-
out.write("</td></tr>\n");
109+
oldWriter.write("</td><td style=\"border-style: none\">");
110+
oldWriter.write(PageFlowUtil.filter(dataset.getLabel()));
111+
oldWriter.write("</td></tr>\n");
111112
}
112-
out.write("</table>");
113+
oldWriter.write("</table>");
113114
}
114115

115116
@Override

0 commit comments

Comments
 (0)