diff --git a/awx/ui_next/src/components/ListHeader/ListHeader.test.jsx b/awx/ui_next/src/components/ListHeader/ListHeader.test.jsx index 4480824a5a..b4481d6d13 100644 --- a/awx/ui_next/src/components/ListHeader/ListHeader.test.jsx +++ b/awx/ui_next/src/components/ListHeader/ListHeader.test.jsx @@ -1,7 +1,6 @@ import React from 'react'; import { createMemoryHistory } from 'history'; import { mountWithContexts } from '@testUtils/enzymeHelpers'; -import { sleep } from '@testUtils/testUtils'; import ListHeader from './ListHeader'; describe('ListHeader', () => { @@ -21,7 +20,7 @@ describe('ListHeader', () => { { name: 'foo', key: 'foo', isDefault: true}, ]} sortColumns={[ - { name: 'foo', key: 'foo', isDefault: true}, + { name: 'foo', key: 'foo'}, ]} renderToolbar={renderToolbarFn} /> @@ -42,7 +41,7 @@ describe('ListHeader', () => { { name: 'foo', key: 'foo', isDefault: true}, ]} sortColumns={[ - { name: 'foo', key: 'foo', isDefault: true}, + { name: 'foo', key: 'foo'}, ]} />, { context: { router: { history } } } diff --git a/awx/ui_next/src/components/Lookup/shared/OptionsList.test.jsx b/awx/ui_next/src/components/Lookup/shared/OptionsList.test.jsx index 9e7214f958..67c8d51b05 100644 --- a/awx/ui_next/src/components/Lookup/shared/OptionsList.test.jsx +++ b/awx/ui_next/src/components/Lookup/shared/OptionsList.test.jsx @@ -3,7 +3,7 @@ import { mountWithContexts } from '@testUtils/enzymeHelpers'; import { getQSConfig } from '@util/qs'; import OptionsList from './OptionsList'; -const qsConfig = getQSConfig('test', {}); +const qsConfig = getQSConfig('test', { order_by: 'foo' }); describe('', () => { it('should display list of options', () => { @@ -17,8 +17,8 @@ describe('', () => { value={[]} options={options} optionCount={3} - searchColumns={[]} - sortColumns={[]} + searchColumns={[{name: 'Foo', key: 'foo', isDefault: true}]} + sortColumns={[{ name: 'Foo', key: 'foo' }]} qsConfig={qsConfig} selectItem={() => {}} deselectItem={() => {}} @@ -40,8 +40,8 @@ describe('', () => { value={[options[1]]} options={options} optionCount={3} - searchColumns={[]} - sortColumns={[]} + searchColumns={[{name: 'Foo', key: 'foo', isDefault: true}]} + sortColumns={[{ name: 'Foo', key: 'foo' }]} qsConfig={qsConfig} selectItem={() => {}} deselectItem={() => {}} diff --git a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx index 66fba00327..158e43ab83 100644 --- a/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx +++ b/awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx @@ -181,7 +181,6 @@ class ResourceAccessList extends React.Component { { name: i18n._(t`Username`), key: 'username', - isDefault: true }, { name: i18n._(t`First Name`), diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx index fcde03f6dd..7b4a17ef67 100644 --- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx +++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx @@ -186,7 +186,6 @@ function InventoryGroupsList({ i18n, location, match }) { { name: i18n._(t`Is root group`), key: 'parents__isnull', - isDefault: true, isBoolean: true }, { diff --git a/awx/ui_next/src/screens/User/UserList/UserList.jsx b/awx/ui_next/src/screens/User/UserList/UserList.jsx index 18c490e908..9ca6400742 100644 --- a/awx/ui_next/src/screens/User/UserList/UserList.jsx +++ b/awx/ui_next/src/screens/User/UserList/UserList.jsx @@ -173,7 +173,6 @@ class UsersList extends Component { { name: i18n._(t`Username`), key: 'username', - isDefault: true }, { name: i18n._(t`First name`), diff --git a/awx/ui_next/src/types.js b/awx/ui_next/src/types.js index 002f6f5a46..6671c64672 100644 --- a/awx/ui_next/src/types.js +++ b/awx/ui_next/src/types.js @@ -1,5 +1,6 @@ import { shape, + exact, arrayOf, number, string, @@ -251,15 +252,17 @@ export const Group = shape({ }); export const SearchColumns = arrayOf( - shape({ + exact({ name: string.isRequired, key: string.isRequired, isDefault: bool, + isBoolean: bool, + options: arrayOf(arrayOf(string, string)) }) ); export const SortColumns = arrayOf( - shape({ + exact({ name: string.isRequired, key: string.isRequired, })