From d5cd1f3ca8673a7a759667e47283ece56d83f6e8 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 16 Mar 2026 10:05:30 -0700 Subject: [PATCH 1/3] Make getProductConfiguration protected --- src/org/labkey/test/LabKeySiteWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java index 9404a1f18d..0cc14f103e 100644 --- a/src/org/labkey/test/LabKeySiteWrapper.java +++ b/src/org/labkey/test/LabKeySiteWrapper.java @@ -1745,7 +1745,7 @@ public String getConversionErrorMessage(Object value, String fieldName, Class return errorMessage; } - private ProductKey getProductConfiguration() throws IOException, CommandException + protected ProductKey getProductConfiguration() throws IOException, CommandException { SimpleGetCommand command = new SimpleGetCommand("admin", "productFeature"); var resp = command.execute(createDefaultConnection(), "/"); From 1ca5c66a411b52e0da3a5c69e4838038c8bd6095 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 24 Mar 2026 14:53:18 -0700 Subject: [PATCH 2/3] Remove wait for staleness as it doesn't always happen that the fields become stale --- .../test/components/ui/search/EntityFieldFilterModal.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java index 079f24ea7a..616dbc149d 100644 --- a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java +++ b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java @@ -36,8 +36,7 @@ protected void waitForReady() public EntityFieldFilterModal selectQuery(String queryName) { WebElement queryItem = elementCache().findQueryOption(queryName); - getWrapper().doAndWaitForElementToRefresh(queryItem::click, - () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait()); + queryItem.click(); getWrapper().shortWait().until(ExpectedConditions.invisibilityOfElementLocated(BootstrapLocators.loadingSpinner)); From 29e6f7f9349452b9d6d42be4ba01e3390438bbfe Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 25 Mar 2026 08:07:18 -0700 Subject: [PATCH 3/3] Revert to sleep instead of wait for staleness. --- .../test/components/ui/search/EntityFieldFilterModal.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java index 616dbc149d..2721c39007 100644 --- a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java +++ b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java @@ -10,6 +10,8 @@ import java.util.List; +import static org.labkey.test.WebDriverWrapper.sleep; + /** * Wraps 'labkey-ui-component' defined in internal/components/search/EntityFieldFilterModal.tsx */ @@ -37,6 +39,12 @@ public EntityFieldFilterModal selectQuery(String queryName) { WebElement queryItem = elementCache().findQueryOption(queryName); queryItem.click(); + sleep(500); // wait for the fields to be displayed or updated. + // The wait below does not consistently work. It works for the first rendering of the modal, but + // if the modal is opened with a query already selected, selecting another query does not cause + // staleness of the field panel elements, only an update of the contents. +// getWrapper().doAndWaitForElementToRefresh(queryItem::click, +// () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait()); getWrapper().shortWait().until(ExpectedConditions.invisibilityOfElementLocated(BootstrapLocators.loadingSpinner));