Skip to content
2 changes: 1 addition & 1 deletion src/org/labkey/test/LabKeySiteWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(), "/");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import java.util.List;

import static org.labkey.test.WebDriverWrapper.sleep;

/**
* Wraps 'labkey-ui-component' defined in <code>internal/components/search/EntityFieldFilterModal.tsx</code>
*/
Expand All @@ -36,8 +38,13 @@ 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();
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));

Expand Down
Loading