QueryGrid.showChart to wait for previous chart to be stale

Author: cnathe

src/org/labkey/test/components/react/QueryChartDialog.java

@@ -527,7 +527,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");
+        private final Locator svgLoc = Locator.tagWithClass("div", "svg-chart__chart").childTag("svg");
 
         public WebElement svg()
         {

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

@@ -719,7 +719,14 @@ public QueryGrid resetToDefaultState(boolean revertDefaultView)
 
     public QueryChartPanel showChart(String chartName)
     {
+        // if there was a different chart already shown, wait for it to close first
+        // NOTE: this will need to be updated soon with the changes for the "multiple chart rendering" feature
+        WebElement prevChart = hasChartPanel() ? getChartPanel().getSvgChart() : null;
+
         elementCache().chartsMenu.clickSubMenu(false, chartName);
+
+        if (prevChart != null)
+            getWrapper().shortWait().until(ExpectedConditions.stalenessOf(prevChart));
         return getChartPanel();
     }
 
@@ -737,6 +744,12 @@ public QueryChartPanel getChartPanel()
         return new QueryChartPanel.QueryChartPanelFinder(getDriver(), this).waitFor(this);
     }
 
+    public boolean hasChartPanel()
+    {
+        QueryChartPanel chartPanel = new QueryChartPanel.QueryChartPanelFinder(getDriver(), this).findOrNull(this);
+        return chartPanel != null;
+    }
+
     public WebElement showRReport(String reportName)
     {
         elementCache().chartsMenu.clickSubMenu(false, reportName);