Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/org/labkey/targetedms/view/qcTrendPlotReport.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
dependencies.add("Ext4");
dependencies.add("Ext4ClientApi");
dependencies.add("vis/vis");
dependencies.add("internal/tippy");
dependencies.add("hopscotch/css/hopscotch.min.css");
dependencies.add("hopscotch/js/hopscotch.min.js");
dependencies.add("targetedms/css/SVGExportIcon.css");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,11 @@ public WebElement openExclusionBubble(String acquiredDate)
WebElement point = getPointByAcquiredDate(acquiredDate);
ScrollUtils.scrollIntoView(point, center, center);
getWrapper().mouseOverWithoutScrolling(point);
return getWrapper().isElementPresent(Locator.tagWithClass("div", "x4-form-display-field")
.containing(acquiredDate.substring(0, 16))); // drop seconds part (e.g. "2013-08-12 04:54") for trailing mean/CV
return getWrapper().isElementPresent(Locator.tagWithClass("div", "qc-plot-hover-panel")
.withDescendant(Locator.tagWithClass("div", "qc-hover-field")
.containing(acquiredDate.substring(0, 16)))); // drop seconds part (e.g. "2013-08-12 04:54") for trailing mean/CV
});
return elementCache().hopscotchBubble.findElement(getDriver());
return elementCache().tippyBubble.findElement(getDriver());
}

@LogMethod
Expand Down Expand Up @@ -732,13 +733,12 @@ public void goToNextPage()

public Locator.XPathLocator getBubble()
{
return Locator.byClass("hopscotch-bubble-container");
return Locator.tagWithClass("div", "qc-plot-hover-panel");
}

public Locator.XPathLocator getBubbleContent()
{
Locator.XPathLocator hopscotchBubble = Locator.byClass("hopscotch-bubble-container");
return hopscotchBubble.append(Locator.byClass("hopscotch-bubble-content").append(Locator.byClass("hopscotch-content").withText()));
return Locator.tagWithClass("div", "qc-plot-hover-panel");
}

public ConfigureMetricsUIPage clickConfigureQCMetrics()
Expand Down Expand Up @@ -972,6 +972,7 @@ public class Elements extends BodyWebPart<?>.ElementCache
Locator.CssLocator svgBackgrounds = Locator.css("svg g.brush rect.background");
Locator.XPathLocator hopscotchBubble = Locator.byClass("hopscotch-bubble-container");
Locator.XPathLocator hopscotchBubbleClose = Locator.byClass("hopscotch-bubble-close");
Locator.XPathLocator tippyBubble = Locator.tagWithClass("div", "qc-plot-hover-panel");

List<WebElement> findSeriesPanels()
{
Expand Down
21 changes: 15 additions & 6 deletions test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1001,20 +1001,29 @@ private void verifyExclusionButtonSelection(String acquiredDate, QCPlotsWebPart.
{
QCPlotsWebPart qcPlotsWebPart = new PanoramaDashboard(this).getQcPlotsWebPart();
WebElement bubble = qcPlotsWebPart.openExclusionBubble(acquiredDate);
RadioButton radioButton = RadioButton.RadioButton().withLabel(state.getLabel()).find(bubble);
assertTrue("QC data point exclusion selection not as expected:" + state.getLabel(), radioButton.isChecked());
// Updated for tippy implementation - uses standard HTML radio buttons with name="exclusion-status"
WebElement radioButton = Locator.tag("input").withAttribute("type", "radio")
.withAttribute("name", "exclusion-status")
.followingSibling("label").withText(state.getLabel())
.precedingSibling("input").findElement(bubble);
assertTrue("QC data point exclusion selection not as expected:" + state.getLabel(), radioButton.isSelected());
qcPlotsWebPart.closeBubble();
}

private void changePointExclusionState(String acquiredDate, QCPlotsWebPart.QCPlotExclusionState state, int waitForPlotCount)
{
QCPlotsWebPart qcPlotsWebPart = new PanoramaDashboard(this).getQcPlotsWebPart();
WebElement bubble = qcPlotsWebPart.openExclusionBubble(acquiredDate);
RadioButton radioButton = RadioButton.RadioButton().withLabel(state.getLabel()).find(bubble);
if (!radioButton.isChecked())
// Updated for tippy implementation - uses standard HTML radio buttons with name="exclusion-status"
WebElement radioButton = Locator.tag("input").withAttribute("type", "radio")
.withAttribute("name", "exclusion-status")
.followingSibling("label").withText(state.getLabel())
.precedingSibling("input").findElement(bubble);
if (!radioButton.isSelected())
{
radioButton.check();
clickAndWait(Ext4Helper.Locators.ext4Button("Save").findElement(bubble));
radioButton.click();
// Updated for tippy implementation - uses standard HTML button with class="labkey-button"
clickAndWait(Locator.tagWithClass("button", "labkey-button").withText("Save").findElement(bubble));
}
else
qcPlotsWebPart.closeBubble();
Expand Down
Loading