External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-04 04:48:02 -02:30
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files

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 { searchKey, searchValue } = this.state;
const { onSearch, qsConfig } = this.props; const { onSearch, qsConfig } = this.props;
const isNonStringField = key => const isNonStringField =
qsConfig.integerFields.filter(field => field === key).length || qsConfig.integerFields.filter(field => field === searchKey).length ||
qsConfig.dateFields.filter(field => field === key).length; qsConfig.dateFields.filter(field => field === searchKey).length;
// TODO: this will probably become more sophisticated, where date // TODO: this will probably become more sophisticated, where date
// fields and string fields are passed to a formatter // fields and string fields are passed to a formatter

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

@@ -29,7 +29,12 @@ describe('<Search />', () => {
const onSearch = jest.fn(); const onSearch = jest.fn();
search = mountWithContexts( 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'; search.find(searchTextInput).instance().value = 'test-321';
@@ -46,7 +51,12 @@ describe('<Search />', () => {
]; ];
const onSearch = jest.fn(); const onSearch = jest.fn();
const wrapper = mountWithContexts( 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'); ).find('Search');
expect(wrapper.state('isSearchDropdownOpen')).toEqual(false); expect(wrapper.state('isSearchDropdownOpen')).toEqual(false);
wrapper.instance().handleDropdownToggle(true); wrapper.instance().handleDropdownToggle(true);
@@ -65,7 +75,12 @@ describe('<Search />', () => {
]; ];
const onSearch = jest.fn(); const onSearch = jest.fn();
const wrapper = mountWithContexts( 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'); ).find('Search');
expect(wrapper.state('searchKey')).toEqual('name'); expect(wrapper.state('searchKey')).toEqual('name');
wrapper wrapper