From 895c71f62c2d9c19a75972fddc4b34bb4e4af19c Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Tue, 10 Sep 2019 10:07:03 -0400
Subject: [PATCH] removes instances tab from CGs

---
 .../jobs/routes/instanceGroupJobs.route.js    |  5 +-
 .../add-container-group.view.html             |  1 -
 ...tanceGroupsJobsListContainer.controller.js |  2 -
 ...stanceGroupsJobsListContainer.partial.html |  2 +-
 awx/ui/client/src/instance-groups/main.js     | 87 -------------------
 5 files changed, 3 insertions(+), 94 deletions(-)

diff --git a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
index 269c2c6ea0..91de83b254 100644
--- a/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
+++ b/awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
@@ -84,7 +84,7 @@ const containerGroupJobsRoute = {
         }
     },
     views: {
-        'instanceGroupsJobsContainer@instanceGroups': {
+        'containerGroupJobs@instanceGroups': {
             templateUrl: listContainerTemplate,
             controller: listContainerController,
             controllerAs: 'vm'
@@ -108,9 +108,8 @@ const containerGroupJobsRoute = {
         Dataset: [
             '$stateParams',
             'Wait',
-            'GetBasePath',
             'QuerySet',
-            ($stateParams, Wait, GetBasePath, qs) => {
+            ($stateParams, Wait, qs) => {
                 const groupId = $stateParams.instance_group_id;
 
                 const searchParam = $stateParams.job_search;
diff --git a/awx/ui/client/src/instance-groups/container-groups/add-container-group.view.html b/awx/ui/client/src/instance-groups/container-groups/add-container-group.view.html
index 758c24aaa1..375a2fb680 100644
--- a/awx/ui/client/src/instance-groups/container-groups/add-container-group.view.html
+++ b/awx/ui/client/src/instance-groups/container-groups/add-container-group.view.html
@@ -3,7 +3,6 @@
   <at-panel-heading title="{{:: vm.panelTitle }}"></at-panel-heading>
   <at-tab-group>
       <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-group>
   <at-panel-body>
diff --git a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js
index f9f97a513d..bffe4d6064 100644
--- a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js
+++ b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js
@@ -11,7 +11,6 @@ function InstanceGroupJobsContainerController ($scope, strings, $state) {
                     _go: 'instanceGroups.edit'
                 },
                 instances: {
-
                     _go: 'instanceGroups.instances'
                 },
                 jobs: {
@@ -27,7 +26,6 @@ function InstanceGroupJobsContainerController ($scope, strings, $state) {
                     _go: 'instanceGroups.editContainerGroup'
                 },
                 instances: {
-
                     _go: 'instanceGroups.containerGroupInstances'
                 },
                 jobs: {
diff --git a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html
index 6583819549..de8808bda8 100644
--- a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html
+++ b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html
@@ -3,7 +3,7 @@
 
     <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.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-group>
     <div ui-view="jobsList"></div>
diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js
index cc4266f0a5..5c6d5d9886 100644
--- a/awx/ui/client/src/instance-groups/main.js
+++ b/awx/ui/client/src/instance-groups/main.js
@@ -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({
         name: 'instanceGroups.edit',
         route: '/:instance_group_id',