Skip to content

Commit d14832d

Browse files
Fb date time search (#2638)
Co-authored-by: labkey-danield <danield@labkey.com>
1 parent 0d3cbee commit d14832d

File tree

3 files changed

+43
-1
lines changed

3 files changed

+43
-1
lines changed

src/org/labkey/test/components/domain/DomainFieldRow.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,16 @@ public String getDateTimeFormatDate()
13631363
return formatValue;
13641364
}
13651365

1366+
public List<String> getDateTimeFormatDateOptions()
1367+
{
1368+
ArrayList<String> formatValues = new ArrayList<>();
1369+
for (String formatOption : elementCache().dateTimeFormatDateSelect.getOptions())
1370+
{
1371+
formatValues.add(getFormatWithoutExample(formatOption));
1372+
}
1373+
return formatValues;
1374+
}
1375+
13661376
public boolean isDateTimeFormatDateEnabled()
13671377
{
13681378
return elementCache().dateTimeFormatDateSelect.isInteractive();
@@ -1384,6 +1394,16 @@ public String getDateTimeFormatTime()
13841394
return formatValue;
13851395
}
13861396

1397+
public List<String> getDateTimeFormatTimeOptions()
1398+
{
1399+
ArrayList<String> formatValues = new ArrayList<>();
1400+
for (String formatOption : elementCache().dateTimeFormatTimeSelect.getOptions())
1401+
{
1402+
formatValues.add(getFormatWithoutExample(formatOption));
1403+
}
1404+
return formatValues;
1405+
}
1406+
13871407
public boolean isDateTimeFormatTimeEnabled()
13881408
{
13891409
return elementCache().dateTimeFormatTimeSelect.isInteractive();
@@ -1427,6 +1447,16 @@ public String getDateFormat()
14271447
return formatValue;
14281448
}
14291449

1450+
public List<String> getDateFormatOptions()
1451+
{
1452+
List<String> options = new ArrayList<>();
1453+
for (String option : elementCache().dateFormatSelect.getOptions())
1454+
{
1455+
options.add(getFormatWithoutExample(option));
1456+
}
1457+
return options;
1458+
}
1459+
14301460
public boolean isDateFormatEnabled()
14311461
{
14321462
return elementCache().dateFormatSelect.isInteractive();
@@ -1480,6 +1510,16 @@ public String getTimeFormat()
14801510
return formatValue;
14811511
}
14821512

1513+
public List<String> getTimeFormatOptions()
1514+
{
1515+
ArrayList<String> formatValues = new ArrayList<>();
1516+
for (String formatOption : elementCache().timeFormatSelect.getOptions())
1517+
{
1518+
formatValues.add(getFormatWithoutExample(formatOption));
1519+
}
1520+
return formatValues;
1521+
}
1522+
14831523
public boolean isTimeFormatEnabled()
14841524
{
14851525
return elementCache().timeFormatSelect.isInteractive();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ protected void waitForReady()
4444
public GridFilterModal selectField(CharSequence fieldIdentifier)
4545
{
4646
WebElement fieldItem = elementCache().findFieldOption(fieldIdentifier);
47+
getWrapper().scrollIntoView(fieldItem);
4748
String fieldLabel = WebElementUtils.getTextContent(fieldItem);
4849
fieldItem.click();
4950
Locator.byClass("field-modal__col-sub-title").withText("Find values for " + fieldLabel)

src/org/labkey/test/pages/assay/AssayRunsPage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ protected ElementCache newElementCache()
121121

122122
protected class ElementCache extends LabKeyPage.ElementCache
123123
{
124-
MultiMenu manageMenu = new MultiMenu.MultiMenuFinder(getDriver()).withText("Manage").findWhenNeeded(getDriver());
124+
MultiMenu manageMenu = new MultiMenu.MultiMenuFinder(getDriver()).withText("Manage")
125+
.timeout(WAIT_FOR_JAVASCRIPT).findWhenNeeded(getDriver());
125126
}
126127
}

0 commit comments

Comments
 (0)