Skip to content

ConditionalFormatOptions refactor to use ColorPickerInput #2813

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 2 commits into from
Dec 15, 2025
Merged

ConditionalFormatOptions refactor to use ColorPickerInput #2813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb4242a
ConditionalFormatPanel locator updates for using ColorPickerInput
cnathe Dec 10, 2025
d27e8cc
Merge branch 'develop' into fb_condFormatColorPicker
cnathe Dec 15, 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
29 changes: 17 additions & 12 deletions src/org/labkey/test/components/domain/ConditionalFormatPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.labkey.remoteapi.domain.ConditionalFormat;
import org.labkey.remoteapi.query.Filter;
import org.labkey.test.Locator;
import org.labkey.test.components.ColorPickerInput;
import org.labkey.test.components.WebDriverComponent;
import org.labkey.test.components.html.Checkbox;
import org.labkey.test.components.html.Input;
Expand Down Expand Up @@ -134,31 +135,37 @@ public boolean getStrikethroughChecked()
public ConditionalFormatPanel setTextColor(String colorHex)
{
expand();
elementCache().textColor.click();
getWrapper().click(Locator.tagWithAttribute("div", "title", colorHex));
getWrapper().click(Locator.tagWithClass("div", "domain-validator-color-cover")); // click elsewhere on the dialog to close the color picker
setColor(elementCache().textColorPicker, colorHex);
return this;
}

public String getTextStyle()
{
expand();
return elementCache().textColorPreview.getAttribute("style");
return Locator.byClass("color-picker__chip").findElement(elementCache().textColorPicker)
.getAttribute("style");
}

public ConditionalFormatPanel setFillColor(String colorHex)
{
expand();
elementCache().fillColor.click();
getWrapper().click(Locator.tagWithAttribute("div", "title", colorHex));
getWrapper().actionClick(elementCache().fillColor); // close the color picker
setColor(elementCache().fillColorPicker, colorHex);
return this;
}

private void setColor(WebElement colorPickerContainer, String colorHex)
{
Locator.tagWithClassContaining("button", "color-picker__button").findElement(colorPickerContainer).click();
ColorPickerInput colorInput = new ColorPickerInput.ColorPickerInputFinder(getDriver()).findWhenNeeded();
colorInput.setHexValue(colorHex);
colorPickerContainer.click(); // need to click outside the color picker to close it
}

public String getFillStyle()
{
expand();
return elementCache().fillColorPreview.getAttribute("style");
return Locator.byClass("color-picker__chip").findElement(elementCache().fillColorPicker)
.getAttribute("style");
}

public String getPreviewTextStyle()
Expand Down Expand Up @@ -250,10 +257,8 @@ public Checkbox strikethroughCheckbox()
}

final Locator collapseIconLocator = Locator.tagWithClass("div", "domain-validator-collapse-icon");
final WebElement textColor = Locator.tagWithName("button", "domainpropertiesrow-textColor").findWhenNeeded(this);
final WebElement textColorPreview = Locator.tagWithClass("div", "domain-color-preview").index(0).findWhenNeeded(this);
final WebElement fillColor = Locator.tagWithName("button", "domainpropertiesrow-backgroundColor").findWhenNeeded(this);
final WebElement fillColorPreview = Locator.tagWithClass("div", "domain-color-preview").index(1).findWhenNeeded(this);
final WebElement textColorPicker = Locator.byClass("color-picker").withAttribute("data-name", "textColor").findWhenNeeded(this);
final WebElement fillColorPicker = Locator.byClass("color-picker").withAttribute("data-name", "backgroundColor").findWhenNeeded(this);
final WebElement previewTextInput = Locator.tagWithAttribute("input", "value", "Preview Text").findWhenNeeded(this);
final WebElement removeButton = Locator.button("Remove Formatting").findWhenNeeded(this);
}
Expand Down