Tests for multi choice value

src/org/labkey/test/components/domain/DomainFieldRow.java

@@ -767,6 +767,11 @@ public DomainFieldRow clickRemoveOntologyConcept()
     // behind the scenes. Because of that the validator aspect of the TextChoice field is hidden from the user (just like
     // it is in the product).
 
+    public void setAllowMultipleSelections(Boolean allowMultipleSelections)
+    {
+        elementCache().allowMultipleSelectionsCheckbox.set(allowMultipleSelections);
+    }
+
     /**
      * Set the list of allowed values for a TextChoice field.
      *
@@ -1702,6 +1707,10 @@ protected class ElementCache extends WebDriverComponent.ElementCache
         public final WebElement domainWarningIcon = Locator.tagWithClass("span", "domain-warning-icon")
                 .findWhenNeeded(this);
 
+        // text choice field option
+        public final Checkbox allowMultipleSelectionsCheckbox = new Checkbox(Locator.tagWithClass("input", "domain-text-choice-multi")
+                .refindWhenNeeded(this).withTimeout(WAIT_FOR_JAVASCRIPT));
+
         // lookup field options
         public final Select lookupContainerSelect = SelectWrapper.Select(Locator.name("domainpropertiesrow-lookupContainer"))
                 .findWhenNeeded(this);

src/org/labkey/test/components/domain/DomainFormPanel.java

@@ -236,6 +236,17 @@ else if (validator instanceof FieldDefinition.TextChoiceValidator textChoiceVali
                         throw new IllegalArgumentException("TextChoice fields cannot have additional validators.");
                     }
                     fieldRow.setTextChoiceValues(textChoiceValidator.getValues());
+                    fieldRow.setAllowMultipleSelections(false);
+                }
+                else if (validator instanceof FieldDefinition.MultiValueTextChoiceValidator multiValueTextChoiceValidator)
+                {
+                    // MultiValueTextChoice is a field type; implemented using a special validator. TextChoice field cannot have other validators.
+                    if (validators.size() > 1)
+                    {
+                        throw new IllegalArgumentException("TextChoice fields cannot have additional validators.");
+                    }
+                    fieldRow.setTextChoiceValues(multiValueTextChoiceValidator.getValues());
+                    fieldRow.setAllowMultipleSelections(true);
                 }
                 else
                 {

src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java

@@ -124,6 +124,19 @@ public EntityBulkUpdateDialog setSelectionField(CharSequence fieldIdentifier, Li
         return this;
     }
 
+    /**
+     * Clear the field (fieldIdentifier).
+     *
+     * @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey})
+     * @return this component
+     */
+    public EntityBulkUpdateDialog clearSelection(CharSequence fieldIdentifier)
+    {
+        FilteringReactSelect reactSelect = enableSelectionField(fieldIdentifier);
+        reactSelect.clearSelection();
+        return this;
+    }
+
     /**
      * @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey})
      * @param selectValue value to select

src/org/labkey/test/components/ui/grids/EditableGrid.java

@@ -507,11 +507,14 @@ public WebElement setCellValue(int row, CharSequence columnIdentifier, Object va
 
         if (value instanceof List)
         {
+
             // If this is a list assume that it will need a lookup.
             List<String> values = (List) value;
 
             ReactSelect lookupSelect = elementCache().lookupSelect(gridCell);
 
+            lookupSelect.clearSelection();
+
             lookupSelect.open();
 
             for (String _value : values)

src/org/labkey/test/components/ui/grids/ResponsiveGrid.java

@@ -17,6 +17,7 @@
 import org.labkey.test.components.react.ReactCheckBox;
 import org.labkey.test.components.ui.grids.FieldReferenceManager.FieldReference;
 import org.labkey.test.components.ui.search.FilterExpressionPanel;
+import org.labkey.test.components.ui.search.FilterFacetedPanel;
 import org.labkey.test.params.FieldKey;
 import org.labkey.test.util.selenium.WebElementUtils;
 import org.openqa.selenium.Keys;
@@ -40,6 +41,14 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.labkey.remoteapi.query.Filter.Operator.CONTAINS_ALL;
+import static org.labkey.remoteapi.query.Filter.Operator.CONTAINS_ANY;
+import static org.labkey.remoteapi.query.Filter.Operator.CONTAINS_EXACTLY;
+import static org.labkey.remoteapi.query.Filter.Operator.CONTAINS_NONE;
+import static org.labkey.remoteapi.query.Filter.Operator.DOES_NOT_CONTAIN_EXACTLY;
+import static org.labkey.remoteapi.query.Filter.Operator.IN;
+import static org.labkey.remoteapi.query.Filter.Operator.IS_EMPTY;
+import static org.labkey.remoteapi.query.Filter.Operator.IS_NOT_EMPTY;
 import static org.labkey.test.WebDriverWrapper.waitFor;
 
 public class ResponsiveGrid<T extends ResponsiveGrid<?>> extends WebDriverComponent<ResponsiveGrid<T>.ElementCache> implements UpdatingComponent
@@ -234,18 +243,31 @@ public String filterColumnExpectingError(CharSequence columnIdentifier, Filter.O
 
     private GridFilterModal initFilterColumn(CharSequence columnIdentifier, Filter.Operator operator, Object value)
     {
+        List<Filter.Operator> listOperators = List.of(IN, CONTAINS_ALL, CONTAINS_ANY, CONTAINS_EXACTLY, CONTAINS_NONE,
+                DOES_NOT_CONTAIN_EXACTLY);
         clickColumnMenuItem(columnIdentifier, "Filter...", false);
         GridFilterModal filterModal = new GridFilterModal(getDriver(), this);
         if (operator != null)
         {
-            if (operator.equals(Filter.Operator.IN) && value instanceof List<?>)
+            if (listOperators.contains(operator) && value instanceof List<?>)
             {
                 List<String> values = (List<String>) value;
-                filterModal.selectFacetTab().selectValue(values.get(0));
-                filterModal.selectFacetTab().checkValues(values.toArray(String[]::new));
+                FilterFacetedPanel filterPanel = filterModal.selectFacetTab();
+                filterPanel.selectValue(values.get(0));
+                filterPanel.checkValues(values.toArray(String[]::new));
+                if (filterPanel.isFiltersPresented())
+                {
+                    filterPanel.selectFilter(operator);
+                }
+            }
+            else if (value == null)
+            {
+                filterModal.selectFacetTab().selectFilter(operator);
             }
             else
+            {
                 filterModal.selectExpressionTab().setFilter(new FilterExpressionPanel.Expression(operator, value));
+            }
         }
         return filterModal;
     }
@@ -385,15 +407,16 @@ public T selectRow(int index, boolean checked)
 
     /**
      * Finds the first row with the specified texts in the specified columns, and sets its checkbox
-     * @param partialMap    key-column (fieldKey, name, or label), value-text in that column
-     * @param checked       the desired checkbox state
+     *
+     * @param partialMap key-column (fieldKey, name, or label), value-text in that column
+     * @param checked    the desired checkbox state
      * @return this grid
      */
     public T selectRow(Map<String, String> partialMap, boolean checked)
     {
         GridRow row = getRow(partialMap);
         selectRowAndVerifyCheckedCounts(row, checked);
-        getWrapper().log("Row described by map ["+partialMap+"] selection state set to + ["+row.isSelected()+"]");
+        getWrapper().log("Row described by map [" + partialMap + "] selection state set to + [" + row.isSelected() + "]");
 
         return getThis();
     }

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

@@ -6,15 +6,19 @@
 import org.labkey.test.components.WebDriverComponent;
 import org.labkey.test.components.html.Checkbox;
 import org.labkey.test.components.html.Input;
+import org.labkey.test.components.react.ReactSelect;
 import org.labkey.test.components.ui.FilterStatusValue;
+import org.labkey.remoteapi.query.Filter;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.labkey.test.WebDriverWrapper.waitFor;
 import static org.labkey.test.components.html.Input.Input;
+import static org.labkey.test.util.samplemanagement.SMTestUtils.isVisible;
 
 public class FilterFacetedPanel extends WebDriverComponent<FilterFacetedPanel.ElementCache>
 {
@@ -48,6 +52,23 @@ public void selectValue(String value)
         elementCache().findCheckboxLabel(value).click();
     }
 
+    /**
+     * Check that filter choosing option exists on the page.
+     */
+    public boolean isFiltersPresented()
+    {
+        return waitFor(() -> isVisible(elementCache().filterTypeSelects), 1000);
+    }
+
+    /**
+     * Select a filer by clicking its label. Right now this method relevant only for multi-value text choice.
+     * @param operator desired filter value
+     */
+    public void selectFilter(Filter.Operator operator)
+    {
+        elementCache().filterTypeSelects.select(operator.getDisplayValue());
+    }
+
     /**
      * Check single facet value by label to see if it is checked or not.
      * @param value desired value
@@ -123,6 +144,8 @@ protected class ElementCache extends Component<?>.ElementCache
     {
         protected final Input filterInput =
                 Input(Locator.id("filter-faceted__typeahead-input"), getDriver()).findWhenNeeded(this);
+        protected final ReactSelect filterTypeSelects =
+                new ReactSelect.ReactSelectFinder(getDriver()).index(0).findWhenNeeded(this);
         protected final WebElement checkboxSection =
                 Locator.byClass("labkey-wizard-pills").index(0).refindWhenNeeded(this);
         protected final Locator.XPathLocator checkboxLabelLoc

src/org/labkey/test/pages/DatasetInsertPage.java

@@ -22,6 +22,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
+import java.util.List;
 import java.util.Map;
 
 import static org.labkey.test.util.EscapeUtil.FORM_FIELD_PREFIX;
@@ -45,26 +46,26 @@ protected void waitForReady()
         waitForElement(Locator.tag("*").attributeStartsWith("name", FORM_FIELD_PREFIX));
     }
 
-    public void insert(Map<String, String> values)
+    public void insert(Map<String, ?> values)
     {
         tryInsert(values);
 
         assertElementNotPresent(Locators.labkeyError);
     }
 
-    public void insert(Map<String, String> values, boolean b, String s)
+    public void insert(Map<String, ?> values, boolean b, String s)
     {
         tryInsert(values);
 
         assertElementNotPresent(Locators.labkeyError);
     }
 
-    public void insertExpectingError(Map<String, String> values)
+    public void insertExpectingError(Map<String, ?> values)
     {
         insertExpectingError(values, null);
     }
 
-    public void insertExpectingError(Map<String, String> values, String errorMsg)
+    public void insertExpectingError(Map<String, ?> values, String errorMsg)
     {
         tryInsert(values);
 
@@ -78,20 +79,20 @@ public void insertExpectingError(Map<String, String> values, String errorMsg)
         }
     }
 
-    private void tryInsert(Map<String, String> values)
+    private void tryInsert(Map<String, ?> values)
     {
-        for (Map.Entry<String, String> entry : values.entrySet())
+        for (Map.Entry<String, ?> entry : values.entrySet())
         {
-            WebElement fieldInput = Locator.name(EscapeUtil.getFormFieldName(entry.getKey())).findElement(getDriver());
+            WebElement fieldInput =  Locator.tag("*").attributeEndsWith("name", EscapeUtil.getFormFieldName(entry.getKey())).findElement(getDriver());
             String type = fieldInput.getAttribute("type");
             switch (type)
             {
                 case "text":
                 case "file":
-                    setFormElement(fieldInput, entry.getValue());
+                    setFormElement(fieldInput, entry.getValue().toString());
                     break;
                 case "checkbox":
-                    if (Boolean.valueOf(entry.getValue()))
+                    if (Boolean.valueOf(entry.getValue().toString()))
                         checkCheckbox(fieldInput);
                     else
                         uncheckCheckbox(fieldInput);
@@ -101,10 +102,19 @@ private void tryInsert(Map<String, String> values)
                     switch (tag)
                     {
                         case "textarea":
-                            setFormElementJS(fieldInput, entry.getValue());
+                            setFormElementJS(fieldInput, entry.getValue().toString());
                             break;
                         case "select":
-                            selectOptionByText(fieldInput, entry.getValue());
+                            if (entry.getValue() instanceof List)
+                            {
+                                List<String> options = (List<String>) entry.getValue();
+                                for (String option : options)
+                                {
+                                    selectOptionByText(fieldInput, option);
+                                }
+                                break;
+                            }
+                            selectOptionByText(fieldInput, entry.getValue().toString());
                             break;
                         default:
                             throw new IllegalArgumentException("Update " + getClass().getSimpleName() + "#insert() to support field: " + entry.getKey() + ", tag = " + tag + ", type = " + type);

src/org/labkey/test/pages/query/UpdateQueryRowPage.java

@@ -13,11 +13,13 @@
 import org.labkey.test.components.html.OptionSelect;
 import org.labkey.test.pages.LabKeyPage;
 import org.labkey.test.util.EscapeUtil;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class UpdateQueryRowPage extends LabKeyPage<UpdateQueryRowPage.ElementCache>
@@ -87,6 +89,10 @@ else if (value instanceof File f)
             {
                 setField(entry.getKey(), f);
             }
+            else if (value instanceof List l)
+            {
+                setField(entry.getKey(), l);
+            }
             else
             {
                 throw new IllegalArgumentException("Unsupported value type for '" + entry.getKey() + "': " + value.getClass().getName());
@@ -99,7 +105,7 @@ public UpdateQueryRowPage setField(String fieldName, String value)
         WebElement field = elementCache().findField(fieldName);
         if (field.getTagName().equals("select"))
         {
-            setField(fieldName, OptionSelect.SelectOption.textOption(value));
+            selectOptionByText(field, value);
         }
         else
         {
@@ -108,6 +114,19 @@ public UpdateQueryRowPage setField(String fieldName, String value)
         return this;
     }
 
+    public UpdateQueryRowPage setField(String fieldName, List<String> values)
+    {
+        WebElement field = elementCache().findField(fieldName, true);
+        List<WebElement> options = field.findElements(By.tagName("option"));
+       //unselect all options that selected but shouldn't be selected
+        options.forEach(option ->
+        {
+            if (!values.contains(option.getText()) && option.getAttribute("selected") != null) option.click();
+        });
+        values.forEach(value -> selectOptionByText(field, value));
+        return this;
+    }
+
     public UpdateQueryRowPage setField(String fieldName, Boolean value)
     {
         new Checkbox(elementCache().findField(fieldName)).set(value);