diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js index 86b604e2cc..93d17a00c9 100644 --- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js +++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js @@ -12,6 +12,7 @@ export default scope.showActivityStreamButton = false; scope.showRefreshButton = false; + scope.alwaysShowRefreshButton = false; scope.loadingLicense = true; scope.$on("$stateChangeSuccess", function updateActivityStreamButton(event, toState, toParams, fromState, fromParams) { @@ -48,6 +49,7 @@ export default } scope.showRefreshButton = (streamConfig && streamConfig.refreshButton) ? true : false; + scope.alwaysShowRefreshButton = (streamConfig && streamConfig.alwaysShowRefreshButton) ? true: false; }); // scope.$on('featuresLoaded', function(){ diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html index a95c4d2996..606eec8b04 100644 --- a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html +++ b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html @@ -8,7 +8,7 @@ data-trigger="hover" data-container="body" ng-hide= "loadingLicense || licenseMissing" - ng-if="(socketStatus === 'error' && showRefreshButton) || $state.includes('instanceGroups')" + ng-if="(socketStatus === 'error' && showRefreshButton) || alwaysShowRefreshButton" ng-click="refresh()"> diff --git a/awx/ui/client/src/instance-groups/instance-group.partial.html b/awx/ui/client/src/instance-groups/instance-group.partial.html index cb8724a85b..9fe3b98d34 100644 --- a/awx/ui/client/src/instance-groups/instance-group.partial.html +++ b/awx/ui/client/src/instance-groups/instance-group.partial.html @@ -3,18 +3,18 @@
-
{{ instanceGroupName | translate }}
+
{{ instanceGroupName }}

Capacity

- {{ instanceGroupCapacity | translate }}% + {{ instanceGroupCapacity }}%

Running Jobs

- {{ instanceGroupJobsRunning | translate}} + {{ instanceGroupJobsRunning }}
diff --git a/awx/ui/client/src/instance-groups/instance-groups.route.js b/awx/ui/client/src/instance-groups/instance-groups.route.js index b9ed461fa3..89cd484dbb 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.route.js +++ b/awx/ui/client/src/instance-groups/instance-groups.route.js @@ -9,6 +9,17 @@ export default { parent: 'setup', label: N_('INSTANCE GROUPS') }, + params: { + instance_group_search: { + value: { + page_size: '10', + order_by: 'name' + } + } + }, + data: { + alwaysShowRefreshButton: true, + }, views: { '@': { templateUrl: templateUrl('./instance-groups/instance-groups'), diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js index cc66f4168d..dcff49f2d0 100644 --- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js +++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js @@ -8,6 +8,15 @@ export default { parent: 'instanceGroups.instances.list', label: N_('{{ breadcrumb.instance_name }}') }, + params: { + instance_job_search: { + value: { + page_size: '10', + order_by: '-finished', + not__launch_type: 'sync' + } + } + }, views: { 'list@instanceGroups.instances.list.job': { templateProvider: function(InstanceJobsList, generateList) { diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html index 20bf3e0fcd..163a2e25fe 100644 --- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html +++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html @@ -3,18 +3,18 @@
-
{{ instanceName | translate }}
+
{{ instanceName }}

Capacity

- {{ instanceCapacity | translate }}% + {{ instanceCapacity }}%

Running Jobs

- {{ instanceJobsRunning | translate }} + {{ instanceJobsRunning }}
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html index 9342125735..ac75597b2a 100644 --- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html +++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html @@ -27,13 +27,13 @@ - {{ instance.hostname | translate }} + {{ instance.hostname }} - {{ instance.percent_capacity_remaining | translate }}% + {{ instance.percent_capacity_remaining }}% - {{ instance.jobs_running | translate }} + {{ instance.jobs_running }} diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.route.js b/awx/ui/client/src/instance-groups/instances/instances-list.route.js index 6b95b33bea..89e572f3d7 100644 --- a/awx/ui/client/src/instance-groups/instances/instances-list.route.js +++ b/awx/ui/client/src/instance-groups/instances/instances-list.route.js @@ -12,7 +12,7 @@ export default { params: { instance_search: { value: { - page_size: '5', + page_size: '10', order_by: 'hostname' } } diff --git a/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js b/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js index d21aa8a669..7dc5230339 100644 --- a/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js +++ b/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js @@ -9,10 +9,11 @@ export default { label: N_('JOBS') }, params: { - instance_group_job_search: { + job_search: { value: { - page_size: '5', - order_by: 'name' + page_size: '10', + order_by: '-finished', + not__launch_type: 'sync' } }, instance_group_id: null diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html index 6692769205..b6d3679a57 100644 --- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html +++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html @@ -4,7 +4,7 @@ INSTANCE GROUPS
- {{ instanceGroupCount | translate}} + {{ instanceGroupCount }}
@@ -38,15 +38,15 @@ - {{ instance_group.name | translate }} - {{ instance_group.instances | translate }} + {{ instance_group.name }} + {{ instance_group.instances }} - {{ instance_group.percent_capacity_remaining | translate }}% + {{ instance_group.percent_capacity_remaining }}% - {{ instance_group.jobs_running | translate }} + {{ instance_group.jobs_running }} diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js index 2d89cd9909..9f3ef11658 100644 --- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js +++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.directive.js @@ -4,7 +4,7 @@ export default ['templateUrl', function(templateUrl) { scope: { instanceGroups: '=' }, - templateUrl: templateUrl('instance-groups/instance-groups-multiselect/instance-groups-modal/instance-groups-modal'), + templateUrl: templateUrl('shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal'), link: function(scope, element) { diff --git a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html index 6c8d91fc45..c61af3ab8b 100644 --- a/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html +++ b/awx/ui/client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html @@ -11,7 +11,7 @@
- {{ tag.name | translate }} + {{ tag.name }}