Skip to content

Commit 64e0319

Browse files
Add support for sample creation actions in workflow jobs (#2920)
1 parent 62fc7bf commit 64e0319

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

src/org/labkey/test/LabKeySiteWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,7 @@ public String getConversionErrorMessage(Object value, String fieldName, Class<?>
17451745
return errorMessage;
17461746
}
17471747

1748-
private ProductKey getProductConfiguration() throws IOException, CommandException
1748+
protected ProductKey getProductConfiguration() throws IOException, CommandException
17491749
{
17501750
SimpleGetCommand command = new SimpleGetCommand("admin", "productFeature");
17511751
var resp = command.execute(createDefaultConnection(), "/");

src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import java.util.List;
1212

13+
import static org.labkey.test.WebDriverWrapper.sleep;
14+
1315
/**
1416
* Wraps 'labkey-ui-component' defined in <code>internal/components/search/EntityFieldFilterModal.tsx</code>
1517
*/
@@ -36,8 +38,13 @@ protected void waitForReady()
3638
public EntityFieldFilterModal selectQuery(String queryName)
3739
{
3840
WebElement queryItem = elementCache().findQueryOption(queryName);
39-
getWrapper().doAndWaitForElementToRefresh(queryItem::click,
40-
() -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
41+
queryItem.click();
42+
sleep(500); // wait for the fields to be displayed or updated.
43+
// The wait below does not consistently work. It works for the first rendering of the modal, but
44+
// if the modal is opened with a query already selected, selecting another query does not cause
45+
// staleness of the field panel elements, only an update of the contents.
46+
// getWrapper().doAndWaitForElementToRefresh(queryItem::click,
47+
// () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
4148

4249
getWrapper().shortWait().until(ExpectedConditions.invisibilityOfElementLocated(BootstrapLocators.loadingSpinner));
4350

0 commit comments

Comments
 (0)