diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java index 6b1c20097d..f53a91cd04 100644 --- a/src/org/labkey/test/components/ui/grids/EditableGrid.java +++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java @@ -949,7 +949,7 @@ public static String formatForPaste(List> rows) if (value instanceof List l) sb.append(formatMultiValueText(l)); else - sb.append(value); + sb.append(quoteForPaste(value.toString())); } } return sb.toString(); diff --git a/src/org/labkey/test/components/ui/grids/GridFilterModal.java b/src/org/labkey/test/components/ui/grids/GridFilterModal.java index 5f34cbcb5b..6398cea9ef 100644 --- a/src/org/labkey/test/components/ui/grids/GridFilterModal.java +++ b/src/org/labkey/test/components/ui/grids/GridFilterModal.java @@ -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."); } diff --git a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java index ae0030bf46..ec6501e08c 100644 --- a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java +++ b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java @@ -48,6 +48,7 @@ import static org.labkey.remoteapi.query.Filter.Operator.ARRAY_CONTAINS_NOT_EXACT; import static org.labkey.remoteapi.query.Filter.Operator.ARRAY_ISEMPTY; import static org.labkey.remoteapi.query.Filter.Operator.ARRAY_ISNOTEMPTY; +import static org.labkey.test.WebDriverWrapper.sleep; import static org.labkey.test.WebDriverWrapper.waitFor; public class ResponsiveGrid> extends WebDriverComponent.ElementCache> implements UpdatingComponent @@ -240,10 +241,10 @@ public String filterColumnExpectingError(CharSequence columnIdentifier, Filter.O return errorMsg; } -private static final List ARRAY_OPERATORS = List.of(ARRAY_CONTAINS_ALL, ARRAY_CONTAINS_ANY, ARRAY_CONTAINS_EXACT, ARRAY_CONTAINS_NONE, + private static final List 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); @@ -261,6 +262,7 @@ private GridFilterModal initFilterColumn(CharSequence columnIdentifier, Filter.O List values = (List) value; filterPanel.selectValue(values.get(0)); filterPanel.checkValues(values.toArray(String[]::new)); + sleep(500); } } else