Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/org/labkey/test/components/ui/grids/GridFilterModal.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,14 @@ public String confirmExpectingError()
return getWrapper().shortWait().until(ExpectedConditions.visibilityOf(elementCache().errorAlert)).getText();
}

public boolean isConfirmButtonEnabled()
{
return elementCache().submitButton.isEnabled();
}

protected void clickConfirm()
{
if (!elementCache().submitButton.isEnabled())
if (!isConfirmButtonEnabled())
{
throw new IllegalStateException("Confirmation button is not enabled.");
}
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ public String filterColumnExpectingError(CharSequence columnIdentifier, Filter.O
return errorMsg;
}

private static final List<Filter.Operator> ARRAY_OPERATORS = List.of(ARRAY_CONTAINS_ALL, ARRAY_CONTAINS_ANY, ARRAY_CONTAINS_EXACT, ARRAY_CONTAINS_NONE,
private static final List<Filter.Operator> ARRAY_OPERATORS = List.of(ARRAY_CONTAINS_ALL, ARRAY_CONTAINS_ANY, ARRAY_CONTAINS_EXACT, ARRAY_CONTAINS_NONE,
ARRAY_CONTAINS_NOT_EXACT, ARRAY_ISEMPTY, ARRAY_ISNOTEMPTY);

private GridFilterModal initFilterColumn(CharSequence columnIdentifier, Filter.Operator operator, Object value)
public GridFilterModal initFilterColumn(CharSequence columnIdentifier, Filter.Operator operator, Object value)
{
clickColumnMenuItem(columnIdentifier, "Filter...", false);
GridFilterModal filterModal = new GridFilterModal(getDriver(), this);
Expand Down
Loading