Skip to content

Commit 8dd7fe3

Browse files
labkey-tchadlabkey-tchad
committed
Get rid of more CustomizeView methods
1 parent 04a1229 commit 8dd7fe3

8 files changed

Lines changed: 31 additions & 34 deletions

File tree

‎src/org/labkey/test/components/CustomizeView.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
import org.openqa.selenium.interactions.Actions;
4646
import org.openqa.selenium.support.ui.ExpectedConditions;
4747

48-
import java.util.ArrayList;
49-
import java.util.Arrays;
5048
import java.util.Iterator;
5149
import java.util.List;
5250

@@ -320,11 +318,6 @@ public void addColumn(CharSequence fieldKey)
320318
addItem(fieldKey, ViewItemType.Columns);
321319
}
322320

323-
public void addColumn(String[] fieldKeyParts)
324-
{
325-
addColumn(StringUtils.join(fieldKeyParts, "/"));
326-
}
327-
328321
public void changeTab(ViewItemType tab)
329322
{
330323
Locator.tag("ul").child(Locator.tag("li").withClass("labkey-customview-tab").containing(tab.toString())).findElement(this).click();
@@ -395,11 +388,6 @@ public void addFilter(CharSequence fieldKey, String filter_type)
395388
addFilter(fieldKey, filter_type, "");
396389
}
397390

398-
public void addFilter(String[] fieldKeyParts, String filter_type, String filter)
399-
{
400-
addFilter(String.join("/", fieldKeyParts), filter_type, filter);
401-
}
402-
403391
public void addFilter(CharSequence fieldKey, String filter_type, String filter)
404392
{
405393
if (filter.isEmpty())
@@ -515,11 +503,6 @@ public void addSort(CharSequence fieldKey, SortDirection order)
515503
itemXPath.append("//tr").findElement(this).click(); // Sort direction doesn't stick without this
516504
}
517505

518-
public void addSort(String[] fieldKeyParts, SortDirection order)
519-
{
520-
addSort(String.join("/", fieldKeyParts), order);
521-
}
522-
523506
public void removeColumn(CharSequence fieldKey)
524507
{
525508
_driver.log("Removing " + fieldKey + " column");

‎src/org/labkey/test/params/FieldKey.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,18 @@ public final class FieldKey implements CharSequence, WrapsFieldKey
2727

2828
private FieldKey(FieldKey parent, String child)
2929
{
30-
_parent = parent;
31-
_name = (parent != null && !parent.getName().isBlank() ? parent.getName() + SEPARATOR : "") + child;
32-
_fieldKey = (parent != null && !parent.getName().isBlank() ? parent + SEPARATOR : "") + encodePart(child);
30+
if (parent != null && !parent.isEmpty())
31+
{
32+
_parent = parent;
33+
_name = parent.getName() + SEPARATOR + child;
34+
_fieldKey = parent + SEPARATOR + encodePart(child);
35+
}
36+
else
37+
{
38+
_parent = null;
39+
_name = child;
40+
_fieldKey = encodePart(child);
41+
}
3342
}
3443

3544
public static List<String> getIllegalChars()

‎src/org/labkey/test/tests/ContainerContextTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.labkey.test.categories.Data;
3636
import org.labkey.test.pages.reports.ScriptReportPage;
3737
import org.labkey.test.params.FieldDefinition;
38+
import org.labkey.test.params.FieldKey;
3839
import org.labkey.test.params.list.IntListDefinition;
3940
import org.labkey.test.util.DataRegionTable;
4041
import org.labkey.test.util.Ext4Helper;
@@ -177,7 +178,7 @@ public void testListLookupURL() throws Exception
177178

178179
log("** Adding in lookup list columns to grid");
179180
_customizeViewsHelper.openCustomizeViewPanel();
180-
_customizeViewsHelper.addColumn(new String[] { "ListLookup", "LookupAge" });
181+
_customizeViewsHelper.addColumn(FieldKey.fromParts("ListLookup", "LookupAge"));
181182
_customizeViewsHelper.saveCustomView();
182183

183184
log("** Checking URLs go to correct container...");

‎src/org/labkey/test/tests/CustomizeViewTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private void saveAfterApplyingView(String name, String newColumnLabel, String ne
300300
@Test
301301
public void saveFilterTest()
302302
{
303-
String fieldKey = FieldKey.fromParts(LAST_NAME_COLUMN).toString();
303+
FieldKey fieldKey = FieldKey.fromParts(LAST_NAME_COLUMN);
304304
String op = "Starts With";
305305
String value = "J";
306306
String[] viewNames = {TRICKY_CHARACTERS + "view", "AAC", "aaa", "aad", "zzz"};
@@ -309,7 +309,7 @@ public void saveFilterTest()
309309
for(String name : viewNames)
310310
{
311311
_customizeViewsHelper.openCustomizeViewPanel();
312-
_customizeViewsHelper.addFilter(new String[]{fieldKey}, op, value);
312+
_customizeViewsHelper.addFilter(fieldKey, op, value);
313313
_customizeViewsHelper.saveCustomView(name);
314314
}
315315

‎src/org/labkey/test/tests/FlagColumnTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.labkey.test.categories.Assays;
1313
import org.labkey.test.categories.Daily;
1414
import org.labkey.test.params.FieldDefinition;
15+
import org.labkey.test.params.FieldKey;
1516
import org.labkey.test.util.DataRegionTable;
1617
import org.labkey.test.util.RelativeUrl;
1718

@@ -116,9 +117,9 @@ private void doInit()
116117
clickAndWait(Locator.linkWithText("view results"));
117118
var customizeView = _customizeViewsHelper.openCustomizeViewPanel();
118119
customizeView.showHiddenItems();
119-
customizeView.addColumn(new String[] { "Run" });
120-
customizeView.addColumn(new String[] { "Run", RUN_FLAG});
121-
customizeView.addColumn(new String[] { "Run", "AnotherRunFlag" });
120+
customizeView.addColumn(FieldKey.fromParts("Run"));
121+
customizeView.addColumn(FieldKey.fromParts("Run", RUN_FLAG));
122+
customizeView.addColumn(FieldKey.fromParts("Run", "AnotherRunFlag"));
122123
customizeView.addSort("RowId", SortDirection.ASC);
123124
customizeView.saveCustomView();
124125

‎src/org/labkey/test/tests/InlineImagesAssayTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.labkey.test.components.CustomizeView;
3131
import org.labkey.test.pages.ReactAssayDesignerPage;
3232
import org.labkey.test.params.FieldDefinition;
33+
import org.labkey.test.params.FieldKey;
3334
import org.labkey.test.util.DataRegionExportHelper;
3435
import org.labkey.test.util.DataRegionTable;
3536
import org.labkey.test.util.ExcelHelper;
@@ -177,8 +178,8 @@ public final void testAssayInlineImages() throws Exception
177178
DataRegionTable list = new DataRegionTable("Data", getDriver());
178179
CustomizeView customizeView = list.openCustomizeGrid();
179180
customizeView.showHiddenItems();
180-
customizeView.addColumn(new String[]{"Run", "RowId"});
181-
customizeView.addColumn(new String[]{"Run", "Protocol", "RowId"});
181+
customizeView.addColumn(FieldKey.fromParts("Run", "RowId"));
182+
customizeView.addColumn(FieldKey.fromParts("Run", "Protocol", "RowId"));
182183
customizeView.applyCustomView();
183184
var protocolId = list.getDataAsText(0, "Run/Protocol/RowId");
184185
var runId = list.getDataAsText(0, "Run/RowId");

‎src/org/labkey/test/tests/SampleTypeLineageTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.labkey.test.categories.Daily;
1818
import org.labkey.test.components.ext4.Window;
1919
import org.labkey.test.params.FieldDefinition;
20+
import org.labkey.test.params.FieldKey;
2021
import org.labkey.test.params.experiment.DataClassDefinition;
2122
import org.labkey.test.params.experiment.SampleTypeDefinition;
2223
import org.labkey.test.util.DataRegionTable;
@@ -459,7 +460,7 @@ public void testLineageWithThreeGenerations()
459460
DataRegionTable table = sampleHelper.getSamplesDataRegionTable();
460461
table.openCustomizeGrid();
461462
_customizeViewsHelper.showHiddenItems();
462-
_customizeViewsHelper.addColumn(new String[]{"Inputs", "Materials", parentSampleType});
463+
_customizeViewsHelper.addColumn(FieldKey.fromParts("Inputs", "Materials", parentSampleType));
463464
_customizeViewsHelper.applyCustomView();
464465
waitAndClickAndWait(Locator.linkWithText("SampleSetBVT4"));
465466

‎src/org/labkey/test/tests/flow/FlowTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.labkey.test.pages.flow.reports.ReportEditorPage;
3535
import org.labkey.test.pages.pipeline.PipelineStatusDetailsPage;
3636
import org.labkey.test.params.FieldDefinition;
37+
import org.labkey.test.params.FieldKey;
3738
import org.labkey.test.tests.AuditLogTest;
3839
import org.labkey.test.util.DataRegion;
3940
import org.labkey.test.util.DataRegionTable;
@@ -787,13 +788,13 @@ private void verifyReport(@LoggedParam String reportName)
787788
{
788789
beginAt("/flow" + getContainerPath() + "/query.view?schemaName=flow&query.queryName=FCSAnalyses");
789790

790-
String reportNameEscaped = EscapeUtil.fieldKeyEncodePart(reportName);
791+
FieldKey reportNameFk = FieldKey.fromParts(reportName);
791792

792793
_customizeViewsHelper.openCustomizeViewPanel();
793-
_customizeViewsHelper.addColumn(new String[] { reportNameEscaped, "Raw P" });
794-
_customizeViewsHelper.addColumn(new String[] { reportNameEscaped, "Adjusted P"});
795-
_customizeViewsHelper.addColumn(new String[] { reportNameEscaped, "Response"});
796-
_customizeViewsHelper.addFilter(new String[] { reportNameEscaped, "Response"}, "Equals", "1");
794+
_customizeViewsHelper.addColumn(reportNameFk.child("Raw P"));
795+
_customizeViewsHelper.addColumn(reportNameFk.child("Adjusted P"));
796+
_customizeViewsHelper.addColumn(reportNameFk.child("Response"));
797+
_customizeViewsHelper.addFilter(reportNameFk.child("Response"), "Equals", "1");
797798
_customizeViewsHelper.addSort("Name", SortDirection.ASC);
798799
_customizeViewsHelper.saveCustomView();
799800

0 commit comments

Comments
 (0)