From 4fb7cf81387a85b191f0d4d192adadde0643f6cb Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 18 Nov 2025 13:50:42 -0600
Subject: [PATCH 1/2] QueryChartDialog and QueryChartPanel helpers for new
 trendline provided parameters input select and chart errors

---
 .../components/react/QueryChartDialog.java    | 33 +++++++++++++++++++
 .../components/react/QueryChartPanel.java     |  8 +++++
 2 files changed, 41 insertions(+)

diff --git a/src/org/labkey/test/components/react/QueryChartDialog.java b/src/org/labkey/test/components/react/QueryChartDialog.java
index 29edbd878a..536d6752db 100644
--- a/src/org/labkey/test/components/react/QueryChartDialog.java
+++ b/src/org/labkey/test/components/react/QueryChartDialog.java
@@ -340,6 +340,32 @@ public QueryChartDialog selectTrendline(String field)
         return this;
     }
 
+    public QueryChartDialog setTrendlineProvidedParameters(String field)
+    {
+        clickFieldOptions("Trendline"); // open the popover
+        if (field != null)
+            getTrendlineProvidedParametersSelect().select(field);
+        else
+            getTrendlineProvidedParametersSelect().clearSelection();
+        clickFieldOptions("Trendline"); // close the popover
+        return this;
+    }
+
+    public List<String> getTrendlineProvidedParametersOptions()
+    {
+        clickFieldOptions("Trendline"); // open the popover
+        List<String> options = getTrendlineProvidedParametersSelect().getOptions();
+        clickFieldOptions("Trendline"); // close the popover
+        return options;
+    }
+
+    private ReactSelect getTrendlineProvidedParametersSelect()
+    {
+        // can't use elementCache() because the popover is outside the dialog
+        Locator loc = Locator.tag("div").withChild(Locator.tagContainingText("label", "Provided Parameters"));
+        return ReactSelect.finder(getDriver()).find(loc.waitForElement(getDriver(), 1500));
+    }
+
     public String getSelectedSeries()
     {
         return elementCache().reactSelectByLabel("Series").getValue();
@@ -399,6 +425,12 @@ public boolean isPreviewPresent()
                 elementCache().svgLoc.existsIn(elementCache().previewContainer());
     }
 
+    public List<String> getPreviewErrors()
+    {
+        return elementCache().svgErrorLoc.findElements(elementCache().previewContainer()).stream()
+                .map(WebElement::getText).toList();
+    }
+
     public WebElement getSvgChart()
     {
         WebDriverWrapper.waitFor(()-> isPreviewPresent(),
@@ -534,6 +566,7 @@ public String grayTextPreviewInstruction()
 
         private final Locator previewBodyLoc = Locator.tagWithClass("div", "chart-builder-preview-body");
         private final Locator svgLoc = Locator.tagWithClass("div", "svg-chart__chart").childTag("svg");
+        private final Locator svgErrorLoc = Locator.tagWithClass("div", "svg-chart__chart").childTag("div");
 
         public WebElement svg()
         {
diff --git a/src/org/labkey/test/components/react/QueryChartPanel.java b/src/org/labkey/test/components/react/QueryChartPanel.java
index 4aa22782cf..ea760792a9 100644
--- a/src/org/labkey/test/components/react/QueryChartPanel.java
+++ b/src/org/labkey/test/components/react/QueryChartPanel.java
@@ -9,6 +9,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import java.io.File;
+import java.util.List;
 
 import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
 
@@ -51,6 +52,13 @@ public WebElement getSvgChart()
         return Locator.byClass("svg-chart__chart").childTag("svg").waitForElement(this, WAIT_FOR_JAVASCRIPT);
     }
 
+    public List<String> getChartErrors()
+    {
+        getWrapper().shortWait().until(ExpectedConditions.visibilityOfAllElements(getSvgChart()));
+        return Locator.byClass("svg-chart__chart").childTag("div").findElements(this).stream()
+                .map(WebElement::getText).toList();
+    }
+
     public ResponsiveGrid<?> getCurveStatsGrid()
     {
         return new ResponsiveGrid.ResponsiveGridFinder(getDriver()).waitFor(elementCache().curveStatsPanel);

From e8daf76b27f492e382b14d19fcd75baa94011f64 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Thu, 20 Nov 2025 11:47:36 -0600
Subject: [PATCH 2/2] fix for trendline tooltip close

---
 src/org/labkey/test/components/react/QueryChartDialog.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/labkey/test/components/react/QueryChartDialog.java b/src/org/labkey/test/components/react/QueryChartDialog.java
index 536d6752db..d068ecb59f 100644
--- a/src/org/labkey/test/components/react/QueryChartDialog.java
+++ b/src/org/labkey/test/components/react/QueryChartDialog.java
@@ -347,7 +347,7 @@ public QueryChartDialog setTrendlineProvidedParameters(String field)
             getTrendlineProvidedParametersSelect().select(field);
         else
             getTrendlineProvidedParametersSelect().clearSelection();
-        clickFieldOptions("Trendline"); // close the popover
+        elementCache().title.click(); // close the popover
         return this;
     }
 
@@ -355,7 +355,7 @@ public List<String> getTrendlineProvidedParametersOptions()
     {
         clickFieldOptions("Trendline"); // open the popover
         List<String> options = getTrendlineProvidedParametersSelect().getOptions();
-        clickFieldOptions("Trendline"); // close the popover
+        elementCache().title.click(); // close the popover
         return options;
     }