From f3329c8cce3c2dab611845a5e5f15762140b7adc Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 23 Mar 2018 17:00:41 -0400 Subject: [PATCH] fix instance groups sub jobs lists --- .../jobs/routes/instanceGroupJobs.route.js | 8 ++++---- .../jobs/routes/instanceJobs.route.js | 10 +++++----- awx/ui/client/lib/components/tabs/_index.less | 6 +++++- .../instance-groups.partial.html | 4 +++- ...anceGroupsJobsListContainer.controller.js} | 6 ++++-- ...tanceGroupsJobsListContainer.partial.html} | 2 +- .../instanceJobsListContainer.controller.js | 20 +++++++++++++++++++ .../instanceJobsListContainer.partial.html | 6 ++++++ 8 files changed, 48 insertions(+), 14 deletions(-) rename awx/ui/client/src/instance-groups/jobs/{jobsListContainer.controller.js => instanceGroupsJobsListContainer.controller.js} (78%) rename awx/ui/client/src/instance-groups/jobs/{jobsListContainer.partial.html => instanceGroupsJobsListContainer.partial.html} (89%) create mode 100644 awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js create mode 100644 awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.partial.html diff --git a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js index c6a6f08d92..fe86b78774 100644 --- a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js +++ b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js @@ -1,9 +1,9 @@ -import listContainerController from '~src/instance-groups/jobs/jobsListContainer.controller'; +import listContainerController from '~src/instance-groups/jobs/instanceGroupsJobsListContainer.controller'; import { N_ } from '../../../src/i18n'; import jobsListController from '../jobsList.controller'; const jobsListTemplate = require('~features/jobs/jobsList.view.html'); -const listContainerTemplate = require('~src/instance-groups/jobs/jobsListContainer.partial.html'); +const listContainerTemplate = require('~src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html'); export default { name: 'instanceGroups.jobs', @@ -22,12 +22,12 @@ export default { } }, views: { - 'jobsContainer@instanceGroups': { + 'instanceGroupsJobsContainer@instanceGroups': { templateUrl: listContainerTemplate, controller: listContainerController, controllerAs: 'vm' }, - 'jobsList@instanceGroups': { + 'jobsList@instanceGroups.jobs': { templateUrl: jobsListTemplate, controller: jobsListController, controllerAs: 'vm' diff --git a/awx/ui/client/features/jobs/routes/instanceJobs.route.js b/awx/ui/client/features/jobs/routes/instanceJobs.route.js index 76fed1f1b0..06019bcf22 100644 --- a/awx/ui/client/features/jobs/routes/instanceJobs.route.js +++ b/awx/ui/client/features/jobs/routes/instanceJobs.route.js @@ -1,24 +1,24 @@ -import listContainerController from '~src/instance-groups/jobs/jobsListContainer.controller'; +import listContainerController from '~src/instance-groups/jobs/instanceJobsListContainer.controller'; import { N_ } from '../../../src/i18n'; import jobsListController from '../jobsList.controller'; const jobsListTemplate = require('~features/jobs/jobsList.view.html'); -const listContainerTemplate = require('~src/instance-groups/jobs/jobsListContainer.partial.html'); +const listContainerTemplate = require('~src/instance-groups/jobs/instanceJobsListContainer.partial.html'); export default { name: 'instanceGroups.instanceJobs', url: '/:instance_group_id/instances/:instance_id/jobs', ncyBreadcrumb: { - parent: 'instanceGroups.instances', + parent: 'instanceGroups.edit', label: N_('JOBS') }, views: { - 'jobsContainer@instances': { + 'instanceJobsContainer@instanceGroups': { templateUrl: listContainerTemplate, controller: listContainerController, controllerAs: 'vm' }, - 'jobsList@instances': { + 'jobsList@instanceGroups.instanceJobs': { templateUrl: jobsListTemplate, controller: jobsListController, controllerAs: 'vm' diff --git a/awx/ui/client/lib/components/tabs/_index.less b/awx/ui/client/lib/components/tabs/_index.less index 84b33c2134..e999a75613 100644 --- a/awx/ui/client/lib/components/tabs/_index.less +++ b/awx/ui/client/lib/components/tabs/_index.less @@ -29,4 +29,8 @@ .at-TabGroup + .at-Panel-body { margin-top: 20px; -} \ No newline at end of file +} + +.at-TabGroup--padBelow { + margin-bottom: 20px; +} diff --git a/awx/ui/client/src/instance-groups/instance-groups.partial.html b/awx/ui/client/src/instance-groups/instance-groups.partial.html index 680f8b1ded..bdc05274b6 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.partial.html +++ b/awx/ui/client/src/instance-groups/instance-groups.partial.html @@ -7,7 +7,9 @@
-
+
+ +
diff --git a/awx/ui/client/src/instance-groups/jobs/jobsListContainer.controller.js b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js similarity index 78% rename from awx/ui/client/src/instance-groups/jobs/jobsListContainer.controller.js rename to awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js index 6ccb6775ff..118fc9284b 100644 --- a/awx/ui/client/src/instance-groups/jobs/jobsListContainer.controller.js +++ b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js @@ -7,20 +7,22 @@ function InstanceGroupJobsContainerController (strings, $state) { const instanceGroupId = $state.params.instance_group_id; vm.panelTitle = 'Jobs' + vm.strings = strings; vm.tab = { details: { _go: 'instanceGroups.edit', - _params: { instanceGroupId }, + _params: { instance_group_id: instanceGroupId }, _label: strings.get('tab.DETAILS') }, instances: { _go: 'instanceGroups.instances', - _params: { instanceGroupId }, + _params: { instance_group_id: instanceGroupId }, _label: strings.get('tab.INSTANCES') }, jobs: { _active: true, + _params: { instance_group_id: instanceGroupId }, _label: strings.get('tab.JOBS') } }; diff --git a/awx/ui/client/src/instance-groups/jobs/jobsListContainer.partial.html b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html similarity index 89% rename from awx/ui/client/src/instance-groups/jobs/jobsListContainer.partial.html rename to awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html index 9eab62c32f..8b3f6e5bfd 100644 --- a/awx/ui/client/src/instance-groups/jobs/jobsListContainer.partial.html +++ b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html @@ -2,7 +2,7 @@ {{ vm.panelTitle }} - + {{:: vm.strings.get('tab.DETAILS') }} {{:: vm.strings.get('tab.INSTANCES') }} {{:: vm.strings.get('tab.JOBS') }} diff --git a/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js new file mode 100644 index 0000000000..650b8e28cf --- /dev/null +++ b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js @@ -0,0 +1,20 @@ + +function InstanceGroupJobsContainerController (strings, $state) { + const vm = this || {}; + + init(); + function init() { + const instanceGroupId = $state.params.instance_group_id; + + vm.panelTitle = 'Jobs' + vm.strings = strings; + } + +} + +InstanceGroupJobsContainerController.$inject = [ + 'InstanceGroupsStrings', + '$state' +]; + +export default InstanceGroupJobsContainerController; diff --git a/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.partial.html b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.partial.html new file mode 100644 index 0000000000..1104ee9548 --- /dev/null +++ b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.partial.html @@ -0,0 +1,6 @@ + + + {{ vm.panelTitle }} + +
+