From c164164d6506f8c01185161aeb49a2a508745d6e Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 6 Mar 2025 14:00:12 -0800 Subject: [PATCH 1/3] DataRegion refactor --- .../src/org/labkey/dumbster/view/mailWebPart.jsp | 2 +- .../test/components/dumbster/EmailRecordTable.java | 2 +- src/org/labkey/test/tests/GpatAssayTest.java | 2 +- src/org/labkey/test/tests/PivotQueryTest.java | 2 +- .../tests/assay/AssayRenameExportImportTest.java | 2 +- src/org/labkey/test/tests/flow/FlowTest.java | 2 +- src/org/labkey/test/util/DataRegion.java | 10 +++++----- src/org/labkey/test/util/DataRegionTable.java | 12 ++++++------ 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp b/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp index 6578361db6..113e40d09a 100644 --- a/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp +++ b/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp @@ -123,7 +123,7 @@ function toggleRecorder(checkbox) } - +
diff --git a/src/org/labkey/test/components/dumbster/EmailRecordTable.java b/src/org/labkey/test/components/dumbster/EmailRecordTable.java index 60854c6de7..e703bced81 100644 --- a/src/org/labkey/test/components/dumbster/EmailRecordTable.java +++ b/src/org/labkey/test/components/dumbster/EmailRecordTable.java @@ -36,7 +36,7 @@ public class EmailRecordTable extends Table { private static final String RECORDER_CHECKBOX_NAME = "emailRecordOn"; private static final String _regionName = "EmailRecord"; - private static final Locator gridLocator = Locator.xpath("//table[@lk-region-name='"+ _regionName +"']"); + private static final Locator gridLocator = Locator.xpath("//table[@data-region-name='"+ _regionName +"']"); private static final int _headerRows = 2; private static final int _footerRows = 1; diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java index f4fbd50eae..6a134fdb6a 100644 --- a/src/org/labkey/test/tests/GpatAssayTest.java +++ b/src/org/labkey/test/tests/GpatAssayTest.java @@ -150,7 +150,7 @@ public void testSteps() clickButton("OK", defaultWaitForPage); clickButton("Next", defaultWaitForPage); - WebElement runPropertiesPanel = Locator.tagWithAttributeContaining("form", "lk-region-form", "Runs") + WebElement runPropertiesPanel = Locator.tagWithAttributeContaining("form", "data-region-form", "Runs") .findElement(getDriver()); setFormElement(Locator.name("date").findElement(runPropertiesPanel), diff --git a/src/org/labkey/test/tests/PivotQueryTest.java b/src/org/labkey/test/tests/PivotQueryTest.java index 2c7f5fc4a4..a402c25111 100644 --- a/src/org/labkey/test/tests/PivotQueryTest.java +++ b/src/org/labkey/test/tests/PivotQueryTest.java @@ -84,7 +84,7 @@ public void testPivotQuery() DataRegionTable pivotTable = new DataRegionTable("query", this); pivotTable.setSort("ParticipantId", SortDirection.ASC); - Locator.XPathLocator region = Locator.tagWithAttribute("table", "lk-region-name", "query"); + Locator.XPathLocator region = Locator.tagWithAttribute("table", "data-region-name", "query"); log("** Verifying pivot table headers"); Locator AnalyteName_header = region.append("/thead[1]/tr[1]/th[2]"); diff --git a/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java b/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java index 6ce77b0b9f..4f486a27f2 100644 --- a/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java +++ b/src/org/labkey/test/tests/assay/AssayRenameExportImportTest.java @@ -297,7 +297,7 @@ private void createGpatAssayAndRun(String projectName, String assayName, File ru waitAndClick(Locator.lkButton("Next")); - WebElement runPropertiesPanel = Locator.tagWithAttributeContaining("form", "lk-region-form", "Runs") + WebElement runPropertiesPanel = Locator.tagWithAttributeContaining("form", "data-region-form", "Runs") .findElement(getDriver()); setFormElement(Locator.name("runDate").findElement(runPropertiesPanel), diff --git a/src/org/labkey/test/tests/flow/FlowTest.java b/src/org/labkey/test/tests/flow/FlowTest.java index 0b244b776a..9640ebca5b 100644 --- a/src/org/labkey/test/tests/flow/FlowTest.java +++ b/src/org/labkey/test/tests/flow/FlowTest.java @@ -419,7 +419,7 @@ protected void analysisFilterTest() assertEquals(1, countEnabledInputs(SELECT_CHECKBOX_NAME)); doAndWaitForPageToLoad(() -> selectOptionByText(Locator.name("ff_compensationMatrixOption"), "Matrix: " + FCS_FILE_1 + " comp matrix")); - // Non-standard data-region, can't use `DataRegionTable` component. No enclosing 'lk-region-form' + // Non-standard data-region, can't use `DataRegionTable` component. No enclosing 'data-region-form' doAndWaitForPageSignal(() -> click(Locator.checkboxByName(".toggle")), DataRegion.UPDATE_SIGNAL); clickButton("Analyze selected runs"); diff --git a/src/org/labkey/test/util/DataRegion.java b/src/org/labkey/test/util/DataRegion.java index 2094d6710c..83304f6299 100644 --- a/src/org/labkey/test/util/DataRegion.java +++ b/src/org/labkey/test/util/DataRegion.java @@ -77,7 +77,7 @@ protected DataRegion(WebElement el, WebDriverWrapper driverWrapper) } /** - * @param regionName 'lk-region-name' of the table + * @param regionName 'data-region-name' of the table */ protected DataRegion(String regionName, WebDriverWrapper driverWrapper) { @@ -180,8 +180,8 @@ public String getDataRegionName() { if (_regionName == null) { - String regionName = StringUtils.trimToNull(getComponentElement().getAttribute("lk-region-form")); // new UI - _regionName = regionName != null ? regionName : getComponentElement().getAttribute("lk-region-name"); // old UI + String regionName = StringUtils.trimToNull(getComponentElement().getAttribute("data-region-form")); // new UI + _regionName = regionName != null ? regionName : getComponentElement().getAttribute("data-region-name"); // old UI } return _regionName; } @@ -325,12 +325,12 @@ protected static class Locators { public static Locator.XPathLocator form() { - return Locator.tag("form").withAttribute("lk-region-form"); + return Locator.tag("form").withAttribute("data-region-form"); } public static Locator.XPathLocator form(String regionName) { - return Locator.tagWithAttribute("form", "lk-region-form", regionName); + return Locator.tagWithAttribute("form", "data-region-form", regionName); } } diff --git a/src/org/labkey/test/util/DataRegionTable.java b/src/org/labkey/test/util/DataRegionTable.java index 7e0325d68f..0bff0bc0dd 100644 --- a/src/org/labkey/test/util/DataRegionTable.java +++ b/src/org/labkey/test/util/DataRegionTable.java @@ -81,7 +81,7 @@ public class DataRegionTable extends DataRegion private final Map> _dataCache = new TreeMap<>(); /** - * @param regionName 'lk-region-name' of the table + * @param regionName 'data-region-name' of the table */ public DataRegionTable(String regionName, WebDriverWrapper driverWrapper) { @@ -1471,7 +1471,7 @@ public static Locator.XPathLocator dataRegion(String regionName) public static Locator.XPathLocator dataRegionTable() { - return form().withAttributeMatchingOtherElementAttribute("lk-region-form", Locator.xpath(".//table"), "lk-region-name"); + return form().withAttributeMatchingOtherElementAttribute("data-region-form", Locator.xpath(".//table"), "data-region-name"); } public static Locator.XPathLocator dataRegionTable(String regionName) @@ -1481,19 +1481,19 @@ public static Locator.XPathLocator dataRegionTable(String regionName) public static Locator.XPathLocator table() { - return Locator.tag("table").withAttribute("lk-region-name"); + return Locator.tag("table").withAttribute("data-region-name"); } public static Locator.XPathLocator table(String regionName) { - return Locator.tagWithAttribute("table", "lk-region-name", regionName); + return Locator.tagWithAttribute("table", "data-region-name", regionName); } public static Locator.XPathLocator facetRow(String category) { return Locator.xpath("//div").withClass("x4-grid-body") - .withPredicate(Locator.xpath("//div").withClass("lk-filter-panel-label") - .withText(category)); + .withPredicate(Locator.xpath("//div").withClass("lk-filter-panel-label") + .withText(category)); } public static Locator.XPathLocator facetRowCheckbox(String category) From fce1cba0ce37fd028c6f9d00f871590ea03cee65 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 10 Mar 2025 13:07:52 -0700 Subject: [PATCH 2/3] Reverting unneeded changes --- modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp | 2 +- src/org/labkey/test/components/dumbster/EmailRecordTable.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp b/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp index 113e40d09a..6578361db6 100644 --- a/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp +++ b/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp @@ -123,7 +123,7 @@ function toggleRecorder(checkbox) } -
 
+
diff --git a/src/org/labkey/test/components/dumbster/EmailRecordTable.java b/src/org/labkey/test/components/dumbster/EmailRecordTable.java index e703bced81..60854c6de7 100644 --- a/src/org/labkey/test/components/dumbster/EmailRecordTable.java +++ b/src/org/labkey/test/components/dumbster/EmailRecordTable.java @@ -36,7 +36,7 @@ public class EmailRecordTable extends Table { private static final String RECORDER_CHECKBOX_NAME = "emailRecordOn"; private static final String _regionName = "EmailRecord"; - private static final Locator gridLocator = Locator.xpath("//table[@data-region-name='"+ _regionName +"']"); + private static final Locator gridLocator = Locator.xpath("//table[@lk-region-name='"+ _regionName +"']"); private static final int _headerRows = 2; private static final int _footerRows = 1; From 9bfe7a9e62fe72c8f633c7fdd563f3461d2778c1 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 10 Mar 2025 14:13:46 -0700 Subject: [PATCH 3/3] Use "data-region-facet-name" instead of "lk-region-facet-name" --- src/org/labkey/test/components/study/DatasetFacetPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/components/study/DatasetFacetPanel.java b/src/org/labkey/test/components/study/DatasetFacetPanel.java index e29ce914ed..783c8cf793 100644 --- a/src/org/labkey/test/components/study/DatasetFacetPanel.java +++ b/src/org/labkey/test/components/study/DatasetFacetPanel.java @@ -191,7 +191,7 @@ public static abstract class Locators { private static Locator.XPathLocator facetPanel(String regionName) { - return Locator.tagWithAttribute("div", "lk-region-facet-name", regionName); + return Locator.tagWithAttribute("div", "data-region-facet-name", regionName); } public static Locator.XPathLocator expandedFacetPanel(String regionName)