diff --git a/frontend/components/packs/PacksList/PacksList.jsx b/frontend/components/packs/PacksList/PacksList.jsx index 6bf9aced55..4ad6b05cb2 100644 --- a/frontend/components/packs/PacksList/PacksList.jsx +++ b/frontend/components/packs/PacksList/PacksList.jsx @@ -1,6 +1,6 @@ import React, { Component, PropTypes } from 'react'; import classnames from 'classnames'; -import { includes } from 'lodash'; +import { includes, orderBy } from 'lodash'; import Checkbox from 'components/forms/fields/Checkbox'; import packInterface from 'interfaces/pack'; @@ -85,7 +85,7 @@ class PacksList extends Component { {renderHelpText()} - {!!packs.length && packs.map(pack => renderPack(pack))} + {!!packs.length && orderBy(packs, ['name']).map(pack => renderPack(pack))} ); diff --git a/frontend/components/queries/QueriesList/QueriesList.jsx b/frontend/components/queries/QueriesList/QueriesList.jsx index 64e8b0039b..622f6ca61e 100644 --- a/frontend/components/queries/QueriesList/QueriesList.jsx +++ b/frontend/components/queries/QueriesList/QueriesList.jsx @@ -1,6 +1,6 @@ import React, { Component, PropTypes } from 'react'; import classnames from 'classnames'; -import { includes, size } from 'lodash'; +import { includes, sortBy, size } from 'lodash'; import queryInterface from 'interfaces/query'; import Checkbox from 'components/forms/fields/Checkbox'; @@ -101,7 +101,7 @@ class QueriesList extends Component { {renderHelpText()} - {!!queries.length && queries.map((query) => { + {!!queries.length && sortBy(queries, ['name']).map((query) => { return ( {renderHelpText()} - {!!scheduledQueries.length && scheduledQueries.map((scheduledQuery) => { + {!!scheduledQueries.length && sortBy(scheduledQueries, ['name']).map((scheduledQuery) => { return ( { const mockStore = reduxMockStore(store); const Component = connectedComponent(ConnectedAllPacksPage, { mockStore }); const page = mount(Component).find('AllPacksPage'); - const firstRow = page.find('Row').first(); + const firstRow = page.find('Row').last(); expect(page.prop('selectedPack')).toNotExist(); - firstRow.find('ClickableTableRow').first().simulate('click'); + firstRow.find('ClickableTableRow').last().simulate('click'); const dispatchedActions = mockStore.getActions(); const locationChangeAction = find(dispatchedActions, { type: '@@router/CALL_HISTORY_METHOD' }); diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tests.jsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tests.jsx index c8a4ba3611..b9cb7d6360 100644 --- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tests.jsx +++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tests.jsx @@ -161,11 +161,11 @@ describe('ManageQueriesPage - component', () => { const mockStore = reduxMockStore(store); const Component = connectedComponent(ConnectedManageQueriesPage, { mockStore }); const page = mount(Component).find('ManageQueriesPage'); - const firstRow = page.find('QueriesListRow').first(); + const firstRow = page.find('QueriesListRow').last(); expect(page.prop('selectedQuery')).toNotExist(); - firstRow.find('ClickableTableRow').first().simulate('click'); + firstRow.find('ClickableTableRow').last().simulate('click'); const dispatchedActions = mockStore.getActions(); const locationChangeAction = find(dispatchedActions, { type: '@@router/CALL_HISTORY_METHOD' });