Skip to content

Improve QueryGrid synchronization #2762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Oct 27, 2025
Merged

Improve QueryGrid synchronization #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,7 @@ public long beginAt(String url, int millis, boolean acceptAlerts)
long elapsedTime = doAndWaitForPageToLoad(() -> {
try
{
mouseOut();
getDriver().navigate().to(fullURL);
}
catch (TimeoutException ex)
Expand Down Expand Up @@ -3006,9 +3007,7 @@ public void mouseOut()
try
{
scrollToTop();
WebElement root = Locators.documentRoot.findElement(getDriver());
final Dimension rootSize = root.getSize();
new Actions(getDriver()).moveToElement(root, - (rootSize.getWidth() / 2), - (rootSize.getHeight() / 2)).perform();
new Actions(getDriver()).moveToLocation(0, 0).perform();
}
catch (WebDriverException ignore) { }
}
Expand Down
1 change: 1 addition & 0 deletions src/org/labkey/test/components/ui/grids/QueryGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ public QueryGrid waitForRecordCount(int expectedCount, int milliseconds)
@Override
public void doAndWaitForUpdate(Runnable func)
{
waitForLoaded();
Optional<WebElement> optionalStatus = elementCache().selectionStatusContainerLoc.findOptionalElement(elementCache());

func.run();
Expand Down
8 changes: 4 additions & 4 deletions src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ public WebElement getComponentElement()
public Boolean isLoaded()
{
return getComponentElement().isDisplayed() &&
(!Locators.loadingGrid.existsIn(this) &&
!Locators.loadingGrid.existsIn(this) &&
!Locators.spinner.existsIn(this) &&
Locator.tag("td").existsIn(this)) ||
getGridEmptyMessage().isPresent();
(Locator.tag("td").existsIn(this) ||
getGridEmptyMessage().isPresent());
}

protected void waitForLoaded()
Expand Down Expand Up @@ -788,7 +788,7 @@ public Optional<String> getGridEmptyMessage()

try
{
WebElement tr = Locator.tagWithClass("tr", "grid-empty").refindWhenNeeded(this);
WebElement tr = Locator.tagWithClass("tr", "grid-empty").findWhenNeeded(this);
if (tr.isDisplayed())
{
msg = Optional.of(Locator.tag("td").findElement(tr).getText());
Expand Down