mirror of
https://github.com/ansible/awx.git
synced 2026-02-03 18:48:12 -03:30
removes instances tab from CGs
This commit is contained in:
committed by
Shane McDonald
parent
32a57e9a97
commit
895c71f62c
@@ -84,7 +84,7 @@ const containerGroupJobsRoute = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
views: {
|
views: {
|
||||||
'instanceGroupsJobsContainer@instanceGroups': {
|
'containerGroupJobs@instanceGroups': {
|
||||||
templateUrl: listContainerTemplate,
|
templateUrl: listContainerTemplate,
|
||||||
controller: listContainerController,
|
controller: listContainerController,
|
||||||
controllerAs: 'vm'
|
controllerAs: 'vm'
|
||||||
@@ -108,9 +108,8 @@ const containerGroupJobsRoute = {
|
|||||||
Dataset: [
|
Dataset: [
|
||||||
'$stateParams',
|
'$stateParams',
|
||||||
'Wait',
|
'Wait',
|
||||||
'GetBasePath',
|
|
||||||
'QuerySet',
|
'QuerySet',
|
||||||
($stateParams, Wait, GetBasePath, qs) => {
|
($stateParams, Wait, qs) => {
|
||||||
const groupId = $stateParams.instance_group_id;
|
const groupId = $stateParams.instance_group_id;
|
||||||
|
|
||||||
const searchParam = $stateParams.job_search;
|
const searchParam = $stateParams.job_search;
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
<at-panel-heading title="{{:: vm.panelTitle }}"></at-panel-heading>
|
<at-panel-heading title="{{:: vm.panelTitle }}"></at-panel-heading>
|
||||||
<at-tab-group>
|
<at-tab-group>
|
||||||
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
|
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
|
||||||
<at-tab state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
|
|
||||||
<at-tab state="vm.tab.jobs">{{:: vm.strings.get('tab.JOBS') }}</at-tab>
|
<at-tab state="vm.tab.jobs">{{:: vm.strings.get('tab.JOBS') }}</at-tab>
|
||||||
</at-tab-group>
|
</at-tab-group>
|
||||||
<at-panel-body>
|
<at-panel-body>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ function InstanceGroupJobsContainerController ($scope, strings, $state) {
|
|||||||
_go: 'instanceGroups.edit'
|
_go: 'instanceGroups.edit'
|
||||||
},
|
},
|
||||||
instances: {
|
instances: {
|
||||||
|
|
||||||
_go: 'instanceGroups.instances'
|
_go: 'instanceGroups.instances'
|
||||||
},
|
},
|
||||||
jobs: {
|
jobs: {
|
||||||
@@ -27,7 +26,6 @@ function InstanceGroupJobsContainerController ($scope, strings, $state) {
|
|||||||
_go: 'instanceGroups.editContainerGroup'
|
_go: 'instanceGroups.editContainerGroup'
|
||||||
},
|
},
|
||||||
instances: {
|
instances: {
|
||||||
|
|
||||||
_go: 'instanceGroups.containerGroupInstances'
|
_go: 'instanceGroups.containerGroupInstances'
|
||||||
},
|
},
|
||||||
jobs: {
|
jobs: {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<at-tab-group class="at-TabGroup--padBelow">
|
<at-tab-group class="at-TabGroup--padBelow">
|
||||||
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
|
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
|
||||||
<at-tab state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
|
<at-tab ng-if="$state.is('instanceGroups.jobs')" state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
|
||||||
<at-tab state="vm.tab.jobs">{{:: vm.strings.get('tab.JOBS') }}</at-tab>
|
<at-tab state="vm.tab.jobs">{{:: vm.strings.get('tab.JOBS') }}</at-tab>
|
||||||
</at-tab-group>
|
</at-tab-group>
|
||||||
<div ui-view="jobsList"></div>
|
<div ui-view="jobsList"></div>
|
||||||
|
|||||||
@@ -323,93 +323,6 @@ function InstanceGroupsRun($stateExtender, strings) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$stateExtender.addState({
|
|
||||||
name: 'instanceGroups.containerGroupInstances',
|
|
||||||
url: '/container_group/:instance_group_id/instances',
|
|
||||||
searchPrefix: 'instance',
|
|
||||||
ncyBreadcrumb: {
|
|
||||||
parent: 'instanceGroups.editContainerGroup',
|
|
||||||
label: strings.get('state.INSTANCES_BREADCRUMB_LABEL')
|
|
||||||
},
|
|
||||||
params: {
|
|
||||||
instance_search: {
|
|
||||||
value: {
|
|
||||||
order_by: 'hostname',
|
|
||||||
page_size: '10'
|
|
||||||
},
|
|
||||||
dynamic: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
views: {
|
|
||||||
'containerGroupInstances@instanceGroups': {
|
|
||||||
templateUrl: InstancesTemplate,
|
|
||||||
controller: 'InstanceListController',
|
|
||||||
controllerAs: 'vm'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
resolve: {
|
|
||||||
resolvedModels: InstanceGroupsResolve,
|
|
||||||
Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
|
|
||||||
function (GetBasePath, qs, $stateParams) {
|
|
||||||
let instancesPath = `${GetBasePath('instance_groups')}${$stateParams.instance_group_id}/instances`;
|
|
||||||
return qs.search(instancesPath, $stateParams[`instance_search`]);
|
|
||||||
}
|
|
||||||
],
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$stateExtender.addState({
|
|
||||||
name: 'instanceGroups.containerGroupInstances.modal',
|
|
||||||
abstract: true,
|
|
||||||
ncyBreadcrumb: {
|
|
||||||
skip: true,
|
|
||||||
},
|
|
||||||
views: {
|
|
||||||
"modal": {
|
|
||||||
template: `<div class="Modal-backdrop"></div>
|
|
||||||
<div class="Modal-holder" ui-view="modal" autoscroll="false"></div>`,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$stateExtender.addState({
|
|
||||||
name: 'instanceGroups.containerGroupInstances.modal.add',
|
|
||||||
url: '/add',
|
|
||||||
ncyBreadcrumb: {
|
|
||||||
skip: true,
|
|
||||||
},
|
|
||||||
searchPrefix: 'add_instance',
|
|
||||||
params: {
|
|
||||||
add_instance_search: {
|
|
||||||
value: {
|
|
||||||
page_size: '10',
|
|
||||||
order_by: 'hostname'
|
|
||||||
},
|
|
||||||
dynamic: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
views: {
|
|
||||||
"modal": {
|
|
||||||
templateUrl: InstanceModalTemplate,
|
|
||||||
controller: InstanceModalController,
|
|
||||||
controllerAs: 'vm'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
resolve: {
|
|
||||||
resolvedModels: InstanceGroupsResolve,
|
|
||||||
Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
|
|
||||||
function (GetBasePath, qs, $stateParams) {
|
|
||||||
let path = `${GetBasePath('instances')}`;
|
|
||||||
return qs.search(path, $stateParams[`add_instance_search`]);
|
|
||||||
}
|
|
||||||
],
|
|
||||||
routeData: [function () {
|
|
||||||
return "instanceGroups.containerGroupInstances";
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
$stateExtender.addState({
|
$stateExtender.addState({
|
||||||
name: 'instanceGroups.edit',
|
name: 'instanceGroups.edit',
|
||||||
route: '/:instance_group_id',
|
route: '/:instance_group_id',
|
||||||
|
|||||||
Reference in New Issue
Block a user