Skip to content

Plotting Improvements - Series line type scale and UI #2817

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
cnathe merged 5 commits into from
Dec 22, 2025
Merged

Plotting Improvements - Series line type scale and UI #2817

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cac8232
QueryChartDialog helpers for show/hide points in line chart and per s…
cnathe Dec 16, 2025
fb98609
Merge remote-tracking branch 'origin/develop' into fb_chartSeriesLine…
cnathe Dec 17, 2025
cb2ca75
Merge remote-tracking branch 'origin/develop' into fb_chartSeriesLine…
cnathe Dec 19, 2025
41eb123
Merge remote-tracking branch 'origin/develop' into fb_chartSeriesLine…
cnathe Dec 22, 2025
a5bdfa6
Merge remote-tracking branch 'origin/develop' into fb_chartSeriesLine…
cnathe Dec 22, 2025
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
30 changes: 28 additions & 2 deletions src/org/labkey/test/components/react/QueryChartDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,20 @@ public boolean isLegendPosVisible()
return elementCache().legendBottomRadio.isDisplayed() && elementCache().legendRightRadio.isDisplayed();
}

public QueryChartDialog setPointsHidden(boolean hidden)
{
if (hidden)
elementCache().pointsHideRadio.check();
else
elementCache().pointsShowRadio.check();
return this;
}

public boolean hasPointsHiddenOption()
{
return elementCache().pointsHideRadio.isDisplayed() && elementCache().pointsShowRadio.isDisplayed();
}

/**
* Set the axis scale to 'linear' or 'log' for the given axis
* @param label the axis label
Expand Down Expand Up @@ -661,14 +675,24 @@ public boolean hasLineColorAndStyleSelectOption()
return elementCache().reactSelectByLabel("Line Color and Style", true) != null;
}

public QueryChartDialog selectLineColorAndStyleOption(String option, String hexColor)
public QueryChartDialog selectLineColorAndStyleOption(String option, String hexColor, String lineType)
{
var seriesDropdown = elementCache().reactSelectByLabel("Line Color and Style");
// series select component uses a custom option renderer
seriesDropdown.setOptionLocator((String type) -> Locator.byClass("chart-builder-type-option").withAttribute("data-series-shape", type));
seriesDropdown.setOptionLocator((String type) -> Locator.byClass("chart-builder-type-option").withAttribute("data-series-option", type));
seriesDropdown.select(option);

if (hexColor != null)
setColor(elementCache().seriesColorPicker, hexColor);

// lineType component uses a custom option renderer
if (lineType != null)
{
var lineTypeDropdown = elementCache().reactSelectByLabel("Line Type");
lineTypeDropdown.setOptionLocator((String type) -> Locator.byClass("chart-builder-type-option").withAttribute("data-series-linetype", type));
lineTypeDropdown.select(lineType);
}

return this;
}

Expand Down Expand Up @@ -747,6 +771,8 @@ public WebElement svg()
public RadioButton scaleManualRadio = RadioButton.RadioButton(Locator.radioButtonByNameAndValue("scaleType", "manual")).refindWhenNeeded(fieldOptionPopover);
public RadioButton legendRightRadio = RadioButton.RadioButton(Locator.radioButtonByNameAndValue("legendPos", "right")).refindWhenNeeded(settingsPanel);
public RadioButton legendBottomRadio = RadioButton.RadioButton(Locator.radioButtonByNameAndValue("legendPos", "bottom")).refindWhenNeeded(settingsPanel);
public RadioButton pointsShowRadio = RadioButton.RadioButton(Locator.radioButtonByNameAndValue("hideDataPoints", "false")).refindWhenNeeded(settingsPanel);
public RadioButton pointsHideRadio = RadioButton.RadioButton(Locator.radioButtonByNameAndValue("hideDataPoints", "true")).refindWhenNeeded(settingsPanel);
public Input scaleRangeMinInput = Input(Locator.input("scaleMin"), getDriver()).refindWhenNeeded(fieldOptionPopover);
public Input scaleRangeMaxInput = Input(Locator.input("scaleMax"), getDriver()).refindWhenNeeded(fieldOptionPopover);
public Input yLabelInput = Input(Locator.input("y-label"), getDriver()).refindWhenNeeded(fieldOptionPopover);
Expand Down