Merge branch 'develop' into fb_testFieldKey52556

Author: cnathe

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

@@ -16,6 +16,7 @@
 import org.labkey.test.components.react.ReactDateTimePicker;
 import org.labkey.test.components.react.ToggleButton;
 import org.labkey.test.components.ui.files.FileAttachmentContainer;
+import org.labkey.test.components.ui.files.FileUploadField;
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.FieldKey;
 import org.labkey.test.util.AuditLogHelper;
@@ -268,6 +269,11 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier)
         return this;
     }
 
+    public FileUploadField getExistingFileField(String fieldIdentifier)
+    {
+        return elementCache().fileField(fieldIdentifier);
+    }
+
     /**
      * @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey})
      * @param checked value to set
@@ -469,6 +475,11 @@ public FileAttachmentContainer fileUploadField(CharSequence fieldIdentifier)
             return new FileAttachmentContainer(formRow(fieldIdentifier), getDriver());
         }
 
+        public FileUploadField fileField(CharSequence fieldIdentifier)
+        {
+            return new FileUploadField(Locator.tagWithClass("div", "col-xs-12").findElementOrNull(formRow(fieldIdentifier)), getDriver());
+        }
+
         final Locator textInputLoc = Locator.tagWithAttribute("input", "type", "text");
         final Locator numberInputLoc = Locator.tagWithAttribute("input", "type", "number");
         final Locator checkBoxLoc = Locator.tagWithAttribute("input", "type", "checkbox");

src/org/labkey/test/components/ui/files/FileAttachmentContainer.java

@@ -111,7 +111,7 @@ public String attachFileExpectingAlert(File file)
     /**
      * Returns true if there is a file with that name in the current instance
      */
-    private boolean hasFile(String fileName)
+    public boolean hasFile(String fileName)
     {
         return new FileAttachmentEntry.FileAttachmentEntryFinder(getDriver())
                 .withTitle(fileName).findOptional(this).isPresent();

src/org/labkey/test/components/ui/files/FileUploadField.java

@@ -53,6 +53,16 @@ public boolean hasAttachedFile()
         return !elementCache().fileInputLabel.isDisplayed();
     }
 
+    public String getExistingFileName()
+    {
+        if (hasAttachedFile())
+        {
+            AttachmentCard card = elementCache().getExistingAttachment().get();
+            return card.getFileName();
+        }
+        return null;
+    }
+
     @Override
     public WebElement getComponentElement()
     {

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

@@ -232,7 +232,16 @@ private GridFilterModal initFilterColumn(CharSequence columnIdentifier, Filter.O
         clickColumnMenuItem(columnIdentifier, "Filter...", false);
         GridFilterModal filterModal = new GridFilterModal(getDriver(), this);
         if (operator != null)
-            filterModal.selectExpressionTab().setFilter(new FilterExpressionPanel.Expression(operator, value));
+        {
+            if (operator.equals(Filter.Operator.IN) && value instanceof List<?>)
+            {
+                List<String> values = (List<String>) value;
+                filterModal.selectFacetTab().selectValue(values.get(0));
+                filterModal.selectFacetTab().checkValues(values.toArray(String[]::new));
+            }
+            else
+                filterModal.selectExpressionTab().setFilter(new FilterExpressionPanel.Expression(operator, value));
+        }
         return filterModal;
     }
 

src/org/labkey/test/components/ui/navigation/NavBar.java

@@ -39,7 +39,7 @@ public void clickHeaderLogo()
 
     public String getHeaderLogoImgSrc()
     {
-        return elementCache().headerLogo.getAttribute("src");
+        return elementCache().headerLogoImage.getAttribute("src");
     }
 
     public HasSearchResults searchFor(String searchString)

src/org/labkey/test/util/DataRegionTable.java

@@ -246,7 +246,7 @@ public int getColumnCount()
 
     public boolean hasSummaryStatisticRow()
     {
-        return Locator.css("tr.labkey-col-total").findElements(elementCache()).size() > 0;
+        return !Locator.css("tr.labkey-col-total").findElements(elementCache()).isEmpty();
     }
 
     /**
@@ -457,7 +457,7 @@ public int getColumnIndex(String name)
         if (i < 0)
         {
             List<String> columnLabelsWithoutSpaces = new ArrayList<>(getColumnLabels().size());
-            getColumnLabels().stream().forEach(s -> columnLabelsWithoutSpaces.add(s.replace(" ", "")));
+            getColumnLabels().forEach(s -> columnLabelsWithoutSpaces.add(s.replace(" ", "")));
             i = columnLabelsWithoutSpaces.indexOf(name.replace(" ", ""));
             if (i >= 0)
             {
@@ -825,7 +825,7 @@ public boolean hasHref(int row, String columnName)
     public WebElement getFlag(int row, String columnName)
     {
         var cell = findCell(row, columnName);
-        return tagWithAttribute("i", "flagid").findElement(cell);
+        return tagWithAttribute("i", "data-flagid").findElement(cell);
     }
 
     public boolean isFlagEnabled(int row, String columnName)
@@ -913,7 +913,7 @@ public void clearFlagValue(int row, String columnName)
      */
     public void clearFlagValues()
     {
-        List<WebElement> allFlags = Locator.tagWithAttribute("i", "flagid").findElements(elementCache());
+        List<WebElement> allFlags = Locator.tagWithAttribute("i", "data-flagid").findElements(elementCache());
         for (WebElement flag : allFlags)
         {
             if (isFlagEnabled(flag))