Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Renders query list in case-insensitive alpha order (#1126)

Browse source
This commit is contained in:
Mike Stone 2017-01-30 15:11:13 -05:00 committed by Jason Meller
parent 54653127ee
commit cdc3d1bf3a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/components/queries/QueriesList/QueriesList.jsx
View file

@ -76,10 +76,11 @@ class QueriesList extends Component {
}
render () {
const alphaSort = q => q.name.toLowerCase();
const { checkedQueryIDs, onCheckQuery, onSelectQuery, queries, selectedQuery } = this.props;
const { allQueriesChecked } = this.state;
const { renderHelpText, handleCheckAll } = this;
const sortedQueries = sortBy(queries, [alphaSort]);
const wrapperClassName = classnames(`${baseClass}__table`, {
[`${baseClass}__table--query-selected`]: size(checkedQueryIDs),
});
@ -101,7 +102,7 @@ class QueriesList extends Component {
</thead>
<tbody>
{renderHelpText()}
{!!queries.length && sortBy(queries, ['name']).map((query) => {
{!!sortedQueries.length && sortedQueries.map((query) => {
return (
<QueriesListRow
checked={this.isChecked(query)}

6
frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tests.jsx
View file

@ -16,7 +16,7 @@ const store = {
101: {
...queryStub,
id: 101,
name: 'My unique query name',
name: 'alpha query',
},
},
},
@ -65,7 +65,7 @@ describe('ManageQueriesPage - component', () => {
expect(page.node.getQueries().length).toEqual(2);
fillInFormInput(queryFilterInput, 'My unique query name');
fillInFormInput(queryFilterInput, 'alpha query');
expect(page.node.getQueries().length).toEqual(1);
});
@ -115,7 +115,7 @@ describe('ManageQueriesPage - component', () => {
});
describe('bulk delete action', () => {
const queries = [queryStub, { ...queryStub, id: 101, name: 'My unique query name' }];
const queries = [queryStub, { ...queryStub, id: 101, name: 'alpha query' }];
it('displays the delete action button when a query is checked', () => {
const page = mount(<ManageQueriesPage queries={queries} />);