External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1936 from jakemcdermott/job-results/update-search

Browse Source 
update filterable check for job results search
This commit is contained in:
Jake McDermott 2018-05-24 15:03:39 -04:00 committed by GitHub
commit b68b4db888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/features/output/search.component.js
View File

@ -1,8 +1,8 @@
const templateUrl = require('~features/output/search.partial.html');
const searchReloadOptions = { inherit: false, location: 'replace' };
const searchKeyExamples = ['id:>1', 'task:set', 'created:>=2000-01-01'];
const searchKeyFields = ['changed', 'failed', 'host_name', 'stdout', 'task', 'role', 'playbook', 'play'];
const searchKeyExamples = ['host_name:localhost', 'task:set', 'created:>=2000-01-01'];
const searchKeyFields = ['changed', 'created', 'failed', 'host_name', 'stdout', 'task', 'role', 'playbook', 'play'];
const PLACEHOLDER_RUNNING = 'CANNOT SEARCH RUNNING JOB';
const PLACEHOLDER_DEFAULT = 'SEARCH';
@ -52,11 +52,16 @@ function reloadQueryset (queryset, rejection = REJECT_DEFAULT) {
});
}
const isFilterable = term => {
const field = term[0].split('.')[0].replace(/^-/, '');
return (searchKeyFields.indexOf(field) > -1);
};
function removeSearchTag (index) {
const searchTerm = vm.tags[index];
const currentQueryset = getCurrentQueryset();
const modifiedQueryset = qs.removeTermsFromQueryset(currentQueryset, searchTerm);
const modifiedQueryset = qs.removeTermsFromQueryset(currentQueryset, searchTerm, isFilterable);
reloadQueryset(modifiedQueryset);
}
@ -64,7 +69,7 @@ function removeSearchTag (index) {
function submitSearch () {
const currentQueryset = getCurrentQueryset();
const searchInputQueryset = qs.getSearchInputQueryset(vm.value);
const searchInputQueryset = qs.getSearchInputQueryset(vm.value, isFilterable);
const modifiedQueryset = qs.mergeQueryset(currentQueryset, searchInputQueryset);
reloadQueryset(modifiedQueryset, REJECT_INVALID);