From e629f6a85c3e8cafa34b3ad921508c82913c7edd Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Tue, 13 Jan 2026 14:42:04 -0800
Subject: [PATCH 1/3] Add action to avoid tooltip and fix flaky

---
 src/org/labkey/test/components/ui/grids/EditableGrid.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
index 8ceb908fee..476cbc4743 100644
--- a/src/org/labkey/test/components/ui/grids/EditableGrid.java
+++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -26,6 +26,7 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.NotFoundException;
+import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
@@ -992,8 +993,12 @@ public void selectCellRange(WebElement startCell, WebElement endCell)
     private void dragToCell(WebElement elementToDrag, WebElement destinationCell)
     {
         var size = destinationCell.getSize();
+        Locator.XPathLocator selectionHandleLoc = Locator.byClass("no-margin-top detail__header--name");
+        WebElement title = selectionHandleLoc.findElement(getDriver());
 
         new Actions(getDriver())
+                // Action to avoid tooltip
+                .moveToElement(title)
                 // WebDriver doesn't calculate correct location to click the cell selection handle
                 .moveToElement(elementToDrag, 0, 7)
                 .clickAndHold()

From 4a5b350ed4def33c5cc2f3967161bf39704f2edc Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Tue, 13 Jan 2026 14:58:27 -0800
Subject: [PATCH 2/3] Fix failing build

---
 src/org/labkey/test/components/ui/grids/EditableGrid.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
index 476cbc4743..284d594b6b 100644
--- a/src/org/labkey/test/components/ui/grids/EditableGrid.java
+++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.NotFoundException;
-import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;

From 6e172a3be822664a61ea3943340fd52b7b97553f Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Thu, 15 Jan 2026 16:37:12 -0800
Subject: [PATCH 3/3] Add moveOut to  dismissPopover() Use dismissPopover() to
 ignore tooltip

---
 src/org/labkey/test/components/ui/grids/EditableGrid.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
index 284d594b6b..04aba55749 100644
--- a/src/org/labkey/test/components/ui/grids/EditableGrid.java
+++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -992,12 +992,9 @@ public void selectCellRange(WebElement startCell, WebElement endCell)
     private void dragToCell(WebElement elementToDrag, WebElement destinationCell)
     {
         var size = destinationCell.getSize();
-        Locator.XPathLocator selectionHandleLoc = Locator.byClass("no-margin-top detail__header--name");
-        WebElement title = selectionHandleLoc.findElement(getDriver());
+        dismissPopover();
 
         new Actions(getDriver())
-                // Action to avoid tooltip
-                .moveToElement(title)
                 // WebDriver doesn't calculate correct location to click the cell selection handle
                 .moveToElement(elementToDrag, 0, 7)
                 .clickAndHold()
@@ -1176,6 +1173,7 @@ public String getCellPopoverText(int row, CharSequence columnIdentifier)
 
     public void dismissPopover()
     {
+        getWrapper().mouseOut();
         Locators.popover.findOptionalElement(getDriver()).ifPresent(popover -> {
             getWrapper().mouseOver(popover);
             getWrapper().mouseOut();