shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

rewrite search key type check to be a var instead of a function

Browse Source
This commit is contained in:
John Mitchell 2019-09-18 12:41:05 -04:00
parent d2e335c7c5
commit 9605d8049d
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
View File

@ -7,7 +7,7 @@ describe('<DataListToolbar />', () => {
const QS_CONFIG = {
namespace: 'organization',
dateFields: [ 'modified', 'created' ],
dateFields: ['modified', 'created'],
defaultParams: { page: 1, page_size: 5, order_by: 'name' },
integerFields: ['page', 'page_size'],
};

6
awx/ui_next/src/components/Search/Search.jsx
View File

@ -114,9 +114,9 @@ class Search extends React.Component {
const { searchKey, searchValue } = this.state;
const { onSearch, qsConfig } = this.props;
const isNonStringField = key =>
qsConfig.integerFields.filter(field => field === key).length ||
qsConfig.dateFields.filter(field => field === key).length;
const isNonStringField =
qsConfig.integerFields.filter(field => field === searchKey).length ||
qsConfig.dateFields.filter(field => field === searchKey).length;
// TODO: this will probably become more sophisticated, where date
// fields and string fields are passed to a formatter

23
awx/ui_next/src/components/Search/Search.test.jsx
View File

@ -7,7 +7,7 @@ describe('<Search />', () => {
const QS_CONFIG = {
namespace: 'organization',
dateFields: [ 'modified', 'created' ],
dateFields: ['modified', 'created'],
defaultParams: { page: 1, page_size: 5, order_by: 'name' },
integerFields: ['page', 'page_size'],
};
@ -29,7 +29,12 @@ describe('<Search />', () => {
const onSearch = jest.fn();
search = mountWithContexts(
<Search qsConfig={QS_CONFIG} sortedColumnKey="name" columns={columns} onSearch={onSearch} />
<Search
qsConfig={QS_CONFIG}
sortedColumnKey="name"
columns={columns}
onSearch={onSearch}
/>
);
search.find(searchTextInput).instance().value = 'test-321';
@ -46,7 +51,12 @@ describe('<Search />', () => {
];
const onSearch = jest.fn();
const wrapper = mountWithContexts(
<Search qsConfig={QS_CONFIG} sortedColumnKey="name" columns={columns} onSearch={onSearch} />
<Search
qsConfig={QS_CONFIG}
sortedColumnKey="name"
columns={columns}
onSearch={onSearch}
/>
).find('Search');
expect(wrapper.state('isSearchDropdownOpen')).toEqual(false);
wrapper.instance().handleDropdownToggle(true);
@ -65,7 +75,12 @@ describe('<Search />', () => {
];
const onSearch = jest.fn();
const wrapper = mountWithContexts(
<Search qsConfig={QS_CONFIG} sortedColumnKey="name" columns={columns} onSearch={onSearch} />
<Search
qsConfig={QS_CONFIG}
sortedColumnKey="name"
columns={columns}
onSearch={onSearch}
/>
).find('Search');
expect(wrapper.state('searchKey')).toEqual('name');
wrapper

2
awx/ui_next/src/screens/Organization/OrganizationTeams/OrganizationTeams.test.jsx
View File

@ -65,7 +65,7 @@ describe('<OrganizationTeams />', () => {
expect(list.prop('itemCount')).toEqual(listData.data.count);
expect(list.prop('qsConfig')).toEqual({
namespace: 'team',
dateFields: [ 'modified', 'created' ],
dateFields: ['modified', 'created'],
defaultParams: {
page: 1,
page_size: 5,

4
awx/ui_next/src/util/qs.test.js
View File

@ -78,7 +78,7 @@ describe('qs (qs.js)', () => {
test('should get default QS config object', () => {
expect(getQSConfig('organization')).toEqual({
namespace: 'organization',
dateFields: [ 'modified', 'created' ],
dateFields: ['modified', 'created'],
defaultParams: { page: 1, page_size: 5, order_by: 'name' },
integerFields: ['page', 'page_size'],
});
@ -95,7 +95,7 @@ describe('qs (qs.js)', () => {
};
expect(getQSConfig('inventory', defaults)).toEqual({
namespace: 'inventory',
dateFields: [ 'modified', 'created' ],
dateFields: ['modified', 'created'],
defaultParams: { page: 1, page_size: 15 },
integerFields: ['page', 'page_size'],
});