backport test fixes from develop (#1801)

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

@@ -187,11 +187,6 @@ public FileUploadPanel getFileUploadPanel()
         return panel.fileUploadPanel();
     }
 
-    private Optional<EditableGrid> optionalGrid()
-    {
-        return new EditableGrid.EditableGridFinder(_driver).findOptional(this);
-    }
-
     public EntityInsertPanel setMergeData(boolean allowMerge)
     {
         var panel = showFileUpload();
@@ -213,7 +208,7 @@ public boolean hasMergeOption()
 
     protected FileUploadPanel fileUploadPanel()
     {
-        return new FileUploadPanel.FileUploadPanelFinder(_driver).timeout(WAIT_FOR_JAVASCRIPT).waitFor(this);
+        return elementCache().fileUploadPanel();
     }
 
     private Optional<FileUploadPanel> optionalFileUploadPanel()
@@ -233,7 +228,7 @@ public List<Map<String, String>> getGridData()
 
     public boolean isGridVisible()
     {
-        var optionalGrid = optionalGrid();
+        var optionalGrid = elementCache().optionalGrid();
         return optionalGrid.isPresent() && optionalGrid.get().isDisplayed();
     }
 
@@ -272,7 +267,7 @@ public EntityBulkUpdateDialog clickBulkUpdate()
 
     public boolean hasTabs()
     {
-        return Locator.tagWithClassContaining("ul", "list-group").existsIn(this);
+        return elementCache().hasTabs();
     }
 
     public boolean isFileUploadVisible()
@@ -327,6 +322,11 @@ protected boolean isVisible(Locator locator)
 
     public EntityInsertPanel showGrid()
     {
+        /* either this is a grid-only insert panel, or there will be a mode-select list-item to
+            allow the user to select the grid. Await one or the other to be present   */
+        WebDriverWrapper.waitFor(()-> isGridVisible() || hasTabs(),
+                "Neither the grid nor its selector appeared within the ready timeout", _readyTimeout);
+
         if (!isGridVisible())
         {
             modeSelectListItem("from Grid")
@@ -429,8 +429,28 @@ protected class ElementCache extends Component<?>.ElementCache
 
         EditableGrid grid = new EditableGrid.EditableGridFinder(_driver).timeout(WAIT_FOR_JAVASCRIPT).findWhenNeeded();
 
+        private Optional<EditableGrid> optionalGrid()
+        {
+            return new EditableGrid.EditableGridFinder(_driver).findOptional(this);
+        }
+
+        private Optional<FileUploadPanel> optionalFileUploadPanel()
+        {
+            return new FileUploadPanel.FileUploadPanelFinder(getDriver()).findOptional();
+        }
+
+        protected FileUploadPanel fileUploadPanel()
+        {
+            return new FileUploadPanel.FileUploadPanelFinder(_driver).timeout(WAIT_FOR_JAVASCRIPT).waitFor(this);
+        }
+
         WebElement formatString = Locator.tagWithClass("div","file-form-formats")
                 .refindWhenNeeded(this).withTimeout(WAIT_FOR_JAVASCRIPT);
+
+        public boolean hasTabs()
+        {
+            return Locator.tagWithClassContaining("ul", "list-group").existsIn(elementCache());
+        }
     }
 
     public static class EntityInsertPanelFinder extends WebDriverComponent.WebDriverComponentFinder<EntityInsertPanel, EntityInsertPanelFinder>

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

@@ -30,6 +30,7 @@ public class DetailTableEdit extends WebDriverComponent<DetailTableEdit.ElementC
     private final WebElement _formElement;
     private final WebDriver _driver;
     private String _title;
+    private int _readyTimeout = WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
 
     protected DetailTableEdit(WebElement formElement, WebDriver driver)
     {
@@ -56,6 +57,12 @@ public String getTitle()
         return _title;
     }
 
+    public DetailTableEdit setReadyTimeout(int readyTimeout)
+    {
+        _readyTimeout = readyTimeout;
+        return this;
+    }
+
     /**
      * Check to see if a field is editable. Could be state dependent, that is it returns false if the field is
      * loading but if checked later could return true.
@@ -264,18 +271,6 @@ public String getSelectedValue(String fieldCaption)
         return reactSelect.getValue();
     }
 
-    /**
-     * clears the selections from the specified reactSelect
-     * @param fieldCaption The label text for the select box
-     * @return A reference to the current object
-     */
-    public DetailTableEdit clearSelectionValues(String fieldCaption)
-    {
-        FilteringReactSelect reactSelect = elementCache().findSelect(fieldCaption);
-        reactSelect.clearSelection();
-        return this;
-    }
-
     /*
         This allows you to query a given select in the edit panel to see what options it offers
      */
@@ -329,7 +324,30 @@ public DetailTableEdit setSelectValue(String fieldCaption, List<String> selectVa
      **/
     public DetailTableEdit clearSelectValue(String fieldCaption)
     {
-        elementCache().findSelect(fieldCaption).clearSelection();
+        return clearSelectValue(fieldCaption, true, true);
+    }
+
+    /**
+     * Clear a given select field
+     * @param fieldCaption The caption/label of the field to clear.
+     * @param waitForSelection If true, wait for the select to have a selection before clearing it
+     * @param assertSelection  If true, assert if no selection appears (note: does nothing if waitForSelection is not true)
+     * @return
+     */
+    public DetailTableEdit clearSelectValue(String fieldCaption, boolean waitForSelection, boolean assertSelection)
+    {
+        var select = elementCache().findSelect(fieldCaption);
+        if (waitForSelection)
+        {
+            if (assertSelection) {
+                WebDriverWrapper.waitFor(() -> select.hasSelection(),
+                        String.format("The %s select did not have any selection in time", fieldCaption), _readyTimeout);
+            }
+            else {
+                WebDriverWrapper.waitFor(() -> select.hasSelection(), 1000);
+            }
+        }
+        select.clearSelection();
         return this;
     }