File tree Expand file tree Collapse file tree
src/org/labkey/test/components/ui/grids Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -805,7 +805,7 @@ public Boolean isLoaded()
805805
806806 private boolean isSelectionLoaded ()
807807 {
808- return Locators .selectionStatusContainerLoc .isDisplayed (this );
808+ return ! hasSelectColumn () || Locators .selectionStatusContainerLoc .existsIn (this );
809809 }
810810
811811 final GridBar gridBar = new GridBar .GridBarFinder ().findWhenNeeded (QueryGrid .this );
Original file line number Diff line number Diff line change @@ -824,7 +824,7 @@ protected void waitForLoaded()
824824 WebDriverWrapper .waitFor (this ::isLoaded , "Grid still loading" , 30000 );
825825 }
826826
827- public Boolean isLoaded ()
827+ protected Boolean isLoaded ()
828828 {
829829 return getComponentElement ().isDisplayed () &&
830830 !Locators .loadingGrid .existsIn (this ) &&
@@ -843,7 +843,7 @@ protected boolean hasSelectColumn()
843843 return hasSelectColumn ;
844844 }
845845
846- ReactCheckBox selectAllCheckbox = new ReactCheckBox (Locator .xpath ("//th/input[@type='checkbox']" ).findWhenNeeded (this ))
846+ final ReactCheckBox selectAllCheckbox = new ReactCheckBox (Locator .xpath ("//th/input[@type='checkbox']" ).findWhenNeeded (this ))
847847 {
848848 @ Override
849849 public void toggle ()
You can’t perform that action at this time.
0 commit comments