Skip to content

[bot] Merge 25.11 to develop #2778

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
github-actions merged 4 commits into from
Nov 5, 2025
Merged

[bot] Merge 25.11 to develop #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e95770
Curve Fit Statistic Access (#2775)
labkey-alan Nov 3, 2025
434ff84
Automated test for new table size report (PG only) (#2774)
labkey-jeckels Nov 4, 2025
e77d772
Support <input type="datetime-local"> (#2777)
labkey-jeckels Nov 5, 2025
cd7719b
Merge 25.11 to develop
labkey-teamcity Nov 5, 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: 30 additions & 0 deletions src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3709,6 +3709,9 @@ private void setHtml5Input(WebElement input, String inputType, String value)
case "date":
setHtml5DateInput(input, value);
break;
case "datetime-local":
setHtml5DateTimeInput(input, value);
break;
case "password":
case "search":
setInput(input, value); // These don't require special handling, don't output warning
Expand Down Expand Up @@ -3737,6 +3740,21 @@ private void setHtml5DateInput(WebElement el, String text)
}
}

private void setHtml5DateTimeInput(WebElement el, String text)
{
String inputFormat = "yyyy-MM-dd'T'HH:mm";
SimpleDateFormat inputFormatter = new SimpleDateFormat(inputFormat);

try
{
setHtml5DateTimeInput(el, inputFormatter.parse(text));
}
catch (ParseException e)
{
throw new IllegalArgumentException("Unable to parse date " + text + ". Format should be " + inputFormat);
}
}

private void setHtml5DateInput(WebElement el, Date date)
{
// Firefox requires ISO date format (yyyy-MM-dd)
Expand All @@ -3749,6 +3767,18 @@ private void setHtml5DateInput(WebElement el, Date date)
el.sendKeys(formDate);
}

private void setHtml5DateTimeInput(WebElement el, Date date)
{
// Firefox and Chrome want different formats, neither of which align with all online guidance to use ISO-style
String formFormat = isFirefox() ? "MMddyyyy hh:mm a" : "MM-dd-yyyy'\t'hh:mma";
SimpleDateFormat formFormatter = new SimpleDateFormat(formFormat);
String formDate = formFormatter.format(date);

fireEvent(el, SeleniumEvent.focus);
executeScript("arguments[0].value = ''", el);
el.sendKeys(formDate);
}

private void setHtml5NumberInput(WebElement el, String text)
{

Expand Down
34 changes: 25 additions & 9 deletions src/org/labkey/test/components/react/QueryChartPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.labkey.test.Locator;
import org.labkey.test.components.Component;
import org.labkey.test.components.WebDriverComponent;
import org.labkey.test.components.html.BootstrapMenu;
import org.labkey.test.components.ui.grids.QueryGrid;
import org.labkey.test.components.ui.grids.ResponsiveGrid;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
Expand Down Expand Up @@ -38,11 +38,7 @@ public QueryChartDialog clickEdit()

public File clickExport(String subMenuText)
{
elementCache().exportMenu.expand();
return getWrapper().doAndWaitForDownload(() ->
Locator.tagWithClass("li", "lk-menu-item")
.descendant(Locator.tagContainingText("a", subMenuText))
.findElement(elementCache().headingEl).click());
return getWrapper().doAndWaitForDownload(() -> elementCache().exportMenu.doMenuAction(subMenuText));
}

public String getTitle()
Expand All @@ -55,13 +51,27 @@ public WebElement getSvgChart()
return Locator.byClass("svg-chart__chart").childTag("svg").waitForElement(this, WAIT_FOR_JAVASCRIPT);
}

public QueryGrid clickClose()
public ResponsiveGrid<?> getCurveStatsGrid()
{
return new ResponsiveGrid.ResponsiveGridFinder(getDriver()).waitFor(elementCache().curveStatsPanel);
}

public boolean isCurveStatsPanelPresent()
{
return ElementCache.curveStatsPanelLoc.findOptionalElement(this).isPresent();
}

public File exportCurveStats(String type)
{
return getWrapper().doAndWaitForDownload(() -> elementCache().exportStatsMenu.doMenuAction(type));
}

public void clickClose()
{
var btn = elementCache().closeButton;
getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(btn));
btn.click();
getWrapper().shortWait().until(ExpectedConditions.stalenessOf(btn));
return _queryGrid;
}

@Override
Expand All @@ -88,11 +98,17 @@ protected class ElementCache extends Component<?>.ElementCache
.findWhenNeeded(this).withTimeout(2000);
public final WebElement editButton = Locator.tagWithAttribute("button", "title", "Edit chart")
.findWhenNeeded(headingEl);
public final BootstrapMenu exportMenu = new MultiMenu.MultiMenuFinder(getDriver()).withButtonClass("chart-panel-export-btn").findWhenNeeded(headingEl);
public final MultiMenu exportMenu = new MultiMenu.MultiMenuFinder(getDriver())
.withButtonClass("chart-panel-export-btn")
.findWhenNeeded(headingEl);
public final WebElement closeButton = Locator.tagWithAttribute("button", "title", "Hide chart")
.findWhenNeeded(headingEl);
public final WebElement titleElement= Locator.tagWithClass("div", "chart-panel__heading-title")
.findWhenNeeded(headingEl);
public static final Locator curveStatsPanelLoc = Locator.byClass("curve-fit-statistics");
public final WebElement curveStatsPanel = curveStatsPanelLoc.findWhenNeeded(this).withTimeout(WAIT_FOR_JAVASCRIPT);
public final WebElement curveStatsHeader = Locator.byClass("curve-fit-statistics__header").findWhenNeeded(curveStatsPanel);
public final MultiMenu exportStatsMenu = new MultiMenu.MultiMenuFinder(getDriver()).findWhenNeeded(curveStatsHeader);
}


Expand Down
6 changes: 6 additions & 0 deletions src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,12 @@ public ResponsiveGridFinder inParentWithId(String id)
return this;
}

public ResponsiveGridFinder inParentWithClass(String className)
{
_locator = Locator.byClass(className).child(Locators.responsiveGrid());
return this;
}

public ResponsiveGridFinder withGridId(String id)
{
_locator = Locators.responsiveGrid(id);
Expand Down
5 changes: 5 additions & 0 deletions src/org/labkey/test/pages/core/admin/ShowAdminPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@ public void clickPostgresLocks()
clickSettingsLink("postgres locks");
}

public void clickPostgresTableSizes()
{
clickSettingsLink("postgres table sizes");
}

public List<WebElement> getAllAdminConsoleLinks()
{
goToSettingsSection();
Expand Down
14 changes: 14 additions & 0 deletions src/org/labkey/test/tests/PostgresQueriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public void testQueries() throws IOException, CommandException
goToAdminConsole().clickPostgresLocks();
verifyLocksGrid();

// Verify locks grid as site admin
goToAdminConsole().clickPostgresTableSizes();
verifyTableSizesGrid();

// Verify project admin gets a 401 for locks grid
pushLocation();
Expand Down Expand Up @@ -150,6 +153,17 @@ private void verifyLocksGrid()
Assertions.assertThat(cols).as("pg_locks columns").contains("Locktype", "Virtualtransaction");
}

private void verifyTableSizesGrid()
{
assertTextPresent("pg_tablesizes");
DataRegionTable table = new DataRegionTable("query", this);
List<String> cols = table.getColumnLabels();
Assertions.assertThat(cols).as("pg_tablesizes columns").contains("Table Schema", "Table Name", "Table Size", "Index Size", "Total Size");
// Check a couple of expected tables
table.setFilter("table_schema", "Equals", "audit");
assertTextPresent("queryupdateauditdomain", "userauditdomain");
}

private void verifyActivityGrid(boolean expectDelete)
{
assertTextPresent("pg_stat_activity");
Expand Down