External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2842 from jakemcdermott/fix-2837

Browse Source 
hide counter badges for output only jobs
This commit is contained in:
Jake McDermott
2018-08-14 17:13:45 -04:00
committed by GitHub
parent 93a8a952f1 897fb96f94
commit 14a8258835
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/features/output/constants.js
View File

@@ -17,6 +17,7 @@ export const OUTPUT_ELEMENT_CONTAINER = '.at-Stdout-container';
export const OUTPUT_ELEMENT_TBODY = '#atStdoutResultTable'; export const OUTPUT_ELEMENT_TBODY = '#atStdoutResultTable';
export const OUTPUT_ELEMENT_LAST = '#atStdoutMenuLast'; export const OUTPUT_ELEMENT_LAST = '#atStdoutMenuLast';
export const OUTPUT_MAX_LAG = 120; export const OUTPUT_MAX_LAG = 120;
export const OUTPUT_NO_COUNT_JOB_TYPES = ['ad_hoc_command', 'system_job', 'inventory_update'];
export const OUTPUT_ORDER_BY = 'counter'; export const OUTPUT_ORDER_BY = 'counter';
export const OUTPUT_PAGE_CACHE = true; export const OUTPUT_PAGE_CACHE = true;
export const OUTPUT_PAGE_LIMIT = 5; export const OUTPUT_PAGE_LIMIT = 5;

3
awx/ui/client/features/output/stats.component.js
View File

@@ -1,3 +1,5 @@
import { OUTPUT_NO_COUNT_JOB_TYPES } from './constants';
const templateUrl = require('~features/output/stats.partial.html'); const templateUrl = require('~features/output/stats.partial.html');
let vm; let vm;
@@ -21,6 +23,7 @@ function JobStatsController (strings, { subscribe }) {
}; };
vm.$onInit = () => { vm.$onInit = () => {
vm.hideCounts = OUTPUT_NO_COUNT_JOB_TYPES.includes(vm.resource.model.get('type'));
vm.download = vm.resource.model.get('related.stdout'); vm.download = vm.resource.model.get('related.stdout');
vm.tooltips.toggleExpand = vm.expanded ? vm.tooltips.toggleExpand = vm.expanded ?
strings.get('tooltips.COLLAPSE_OUTPUT') : strings.get('tooltips.COLLAPSE_OUTPUT') :

18
awx/ui/client/features/output/stats.partial.html
View File

@@ -1,16 +1,16 @@
<!-- todo: styling, markup, css etc. - disposition according to project lib conventions --> <!-- todo: styling, markup, css etc. - disposition according to project lib conventions -->
<div class="at-u-floatRight"> <div class="at-u-floatRight">
<span class="at-Panel-label">plays</span> <span ng-show="!vm.hideCounts" class="at-Panel-label">plays</span>
<span ng-show="vm.running" class="at-Panel-headingTitleBadge">...</span> <span ng-show="!vm.hideCounts && vm.running" class="at-Panel-headingTitleBadge">...</span>
<span ng-show="!vm.running" class="at-Panel-headingTitleBadge">{{ vm.plays || 0 }}</span> <span ng-show="!vm.hideCounts && !vm.running" class="at-Panel-headingTitleBadge">{{ vm.plays || 0 }}</span>
<span class="at-Panel-label">tasks</span> <span ng-show="!vm.hideCounts" class="at-Panel-label">tasks</span>
<span ng-show="vm.running" class="at-Panel-headingTitleBadge">...</span> <span ng-show="!vm.hideCounts && vm.running" class="at-Panel-headingTitleBadge">...</span>
<span ng-show="!vm.running" class="at-Panel-headingTitleBadge">{{ vm.tasks || 0 }}</span> <span ng-show="!vm.hideCounts && !vm.running" class="at-Panel-headingTitleBadge">{{ vm.tasks || 0 }}</span>
<span class="at-Panel-label">{{:: vm.strings.get('stats.HOSTS')}}</span> <span ng-show="!vm.hideCounts" class="at-Panel-label">{{:: vm.strings.get('stats.HOSTS')}}</span>
<span ng-show="vm.running" class="at-Panel-headingTitleBadge">...</span> <span ng-show="!vm.hideCounts && vm.running" class="at-Panel-headingTitleBadge">...</span>
<span ng-show="!vm.running" class="at-Panel-headingTitleBadge">{{ vm.hosts || 1 }}</span> <span ng-show="!vm.hideCounts && !vm.running" class="at-Panel-headingTitleBadge">{{ vm.hosts || 1 }}</span>
<span class="at-Panel-label">{{:: vm.strings.get('stats.ELAPSED') }}</span> <span class="at-Panel-label">{{:: vm.strings.get('stats.ELAPSED') }}</span>
<span ng-show="vm.running" class="at-Panel-headingTitleBadge">...</span> <span ng-show="vm.running" class="at-Panel-headingTitleBadge">...</span>