Skip to content

Item 10223: App GridPanel update to display filter/search pills in grid message area (experimental feature) #1061

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 3 commits into from
Apr 7, 2022
Merged

Item 10223: App GridPanel update to display filter/search pills in grid message area (experimental feature) #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6151e8a
App grid change from "Grid Views" to "Views" button text
cnathe Apr 4, 2022
5afdb4e
Test changes for app grid views button changes to icon only
cnathe Apr 6, 2022
bb4f112
Chart button fixes to use cls instead of button text
cnathe Apr 7, 2022
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
6 changes: 6 additions & 0 deletions src/org/labkey/test/components/react/MultiMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ public MultiMenuFinder withButtonId(String id)
return this;
}

public MultiMenuFinder withButtonClass(String cls)
{
_locator = Locators.menuContainer().withChild(Locator.tagWithClass("button", cls));
return this;
}

/**
* Looks for the export button using the fa-download class
* @return export menu utility
Expand Down
5 changes: 0 additions & 5 deletions src/org/labkey/test/components/ui/grids/GridBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,6 @@ static public Locator.XPathLocator gridBar()
return Locator.XPathLocator.union(Locator.tagWithClassContaining("div", "query-grid-bar"),
Locator.tagWithClassContaining("div", "grid-panel__button-bar"));
}

static final Locator.XPathLocator viewSelectorButtonGroup = Locator.tagWithClass("div", "dropdown")
.withChild(Locator.button("Grid Views"));
static final Locator.XPathLocator viewSelectorToggleButton = Locator.button("Grid Views");
static final Locator viewSelectorMenu = Locator.tagWithAttributeContaining("ul", "aria-labelledby", "viewselector");
}

public static class GridBarFinder extends ComponentFinder<QueryGrid, GridBar, GridBarFinder>
Expand Down
10 changes: 7 additions & 3 deletions src/org/labkey/test/components/ui/grids/QueryGrid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;

import java.util.Arrays;
import java.util.Map;
import java.util.Optional;

Expand Down Expand Up @@ -298,8 +297,13 @@ public QueryGrid clearAllSelections()
// select view
public QueryGrid selectView(String viewName)
{
doAndWaitForUpdate(()->
getGridBar().doMenuAction("Grid Views", Arrays.asList(viewName)));
WebElement viewBtn = Locator.tagWithClass("span", "fa-table").findElement(this);
viewBtn.click();

WebElement viewMenuItem = Locator.tagWithClass("ul", "dropdown-menu")
.child(Locator.tagWithText("li", viewName))
.findElement(this);
doAndWaitForUpdate(viewMenuItem::click);
return this;
}

Expand Down