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

disable search while searching

Browse Source
This commit is contained in:
Jake McDermott
2018-04-04 15:52:07 -04:00
parent 356defff09
commit a7bcb491d7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/features/output/search.directive.js
View File

@@ -4,6 +4,9 @@ const searchReloadOptions = { reload: true, inherit: false };
const searchKeyExamples = ['id:>1', 'task:set', 'created:>=2000-01-01']; const searchKeyExamples = ['id:>1', 'task:set', 'created:>=2000-01-01'];
const searchKeyFields = ['changed', 'failed', 'host_name', 'stdout', 'task', 'role', 'playbook', 'play']; const searchKeyFields = ['changed', 'failed', 'host_name', 'stdout', 'task', 'role', 'playbook', 'play'];
const PLACEHOLDER_RUNNING = 'CANNOT SEARCH RUNNING JOB';
const PLACEHOLDER_DEFAULT = 'SEARCH';
let $state; let $state;
let status; let status;
let qs; let qs;
@@ -35,6 +38,7 @@ function removeSearchTag (index) {
const modifiedQueryset = qs.removeTermsFromQueryset(currentQueryset, searchTerm); const modifiedQueryset = qs.removeTermsFromQueryset(currentQueryset, searchTerm);
vm.tags = getSearchTags(modifiedQueryset); vm.tags = getSearchTags(modifiedQueryset);
vm.disabled = true;
$state.params.job_event_search = qs.encodeArr(modifiedQueryset); $state.params.job_event_search = qs.encodeArr(modifiedQueryset);
$state.transitionTo($state.current, $state.params, searchReloadOptions); $state.transitionTo($state.current, $state.params, searchReloadOptions);
@@ -47,6 +51,7 @@ function submitSearch () {
const modifiedQueryset = qs.mergeQueryset(currentQueryset, searchInputQueryset); const modifiedQueryset = qs.mergeQueryset(currentQueryset, searchInputQueryset);
vm.tags = getSearchTags(modifiedQueryset); vm.tags = getSearchTags(modifiedQueryset);
vm.disabled = true;
$state.params.job_event_search = qs.encodeArr(modifiedQueryset); $state.params.job_event_search = qs.encodeArr(modifiedQueryset);
$state.transitionTo($state.current, $state.params, searchReloadOptions); $state.transitionTo($state.current, $state.params, searchReloadOptions);
@@ -54,6 +59,7 @@ function submitSearch () {
function clearSearch () { function clearSearch () {
vm.tags = []; vm.tags = [];
vm.disabled = true;
$state.params.job_event_search = ''; $state.params.job_event_search = '';
$state.transitionTo($state.current, $state.params, searchReloadOptions); $state.transitionTo($state.current, $state.params, searchReloadOptions);
@@ -88,9 +94,13 @@ function AtJobSearchController (_$state_, _status_, _qs_) {
vm.init = scope => { vm.init = scope => {
vm.examples = scope.examples || searchKeyExamples; vm.examples = scope.examples || searchKeyExamples;
vm.fields = scope.fields || searchKeyFields; vm.fields = scope.fields || searchKeyFields;
vm.placeholder = PLACEHOLDER_DEFAULT;
vm.relatedFields = scope.relatedFields || []; vm.relatedFields = scope.relatedFields || [];
scope.$watch(status.isRunning, value => { vm.disabled = value; }); scope.$watch(status.isRunning, value => {
vm.disabled = value;
vm.placeholder = value ? PLACEHOLDER_RUNNING : PLACEHOLDER_DEFAULT;
});
}; };
} }

2
awx/ui/client/features/output/search.partial.html
View File

@@ -5,7 +5,7 @@
class="form-control at-Input" class="form-control at-Input"
ng-class="{ 'at-Input--rejected': vm.rejected }" ng-class="{ 'at-Input--rejected': vm.rejected }"
ng-model="vm.value" ng-model="vm.value"
ng-attr-placeholder="{{ vm.disabled ? 'CANNOT SEARCH RUNNING JOB' : 'SEARCH' }}" ng-attr-placeholder="{{ vm.placeholder }}"
ng-disabled="vm.disabled"> ng-disabled="vm.disabled">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn at-ButtonHollow--default at-Input-button" <button class="btn at-ButtonHollow--default at-Input-button"