From 5cf84ddb60cc14a99458d21422a4c5fce8cf215d Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Fri, 11 Oct 2019 12:03:17 -0400
Subject: [PATCH 1/2] Sys Aud can see CG forms, Adds correct CG form link,
 Disables CodeMirror

This allows the System Auditor to see the container groups form in a disabled state.
If the pod_spec_override has been changed that field will be open when the page renders
but it will be disabled. It also greys out all code mirror text area fields for System Auditor.
It adds the correct url for the Container Groups message bar to inform users of possible
pitfalls associated with that feature.
---
 .../lib/components/code-mirror/_index.less    |  5 ++++
 .../add-container-group.view.html             | 10 ++++---
 .../edit-container-group.controller.js        | 29 +++++++++++++------
 .../instance-groups/instance-group.block.less |  1 +
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/awx/ui/client/lib/components/code-mirror/_index.less b/awx/ui/client/lib/components/code-mirror/_index.less
index 6eeb936e79..d0e2d970e8 100644
--- a/awx/ui/client/lib/components/code-mirror/_index.less
+++ b/awx/ui/client/lib/components/code-mirror/_index.less
@@ -52,6 +52,11 @@
     height: calc(~"100vh - 80px");
 }
 
+textarea[disabled] + div .CodeMirror-code{
+    background-color: #ebebeb;
+    cursor: not-allowed;
+}
+
 
 @media screen and (min-width: 768px){
 	.NetworkingExtraVars .modal-dialog{
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 86ae509309..df8e6afee7 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
@@ -1,5 +1,5 @@
 <div ui-view="credentials"></div>
-<a class="containerGroups-messageBar-link"href="https://docs.ansible.com/ansible-tower/latest/html/userguide/instance_groups.html" target="_blank" style="color: white">
+<a class="containerGroups-messageBar-link" href="https://docs.ansible.com/ansible-tower/latest/html/administration/external_execution_envs.html#container-group-considerations" target="_blank" style="color: white">
   <div class="Section-messageBar">
       <i class="Section-messageBar-warning fa fa-warning"></i>
       <span class="Section-messageBar-text">This feature is tech preview, and is subject to change in a future release. Click here for documentation.</span>
@@ -21,13 +21,15 @@
                 {{ vm.form.extraVars.toggleLabel }}
             </span>
         </label>
-        <div ng-class="{'ContainerGroups-codeMirror': vm.form.extraVars.isOpen }">
-          <at-switch on-toggle="vm.toggle(instance)" switch-on="vm.form.extraVars.isOpen"
-          switch-disabled="vm.rowAction.toggle._disabled"></at-switch>
+        <div ng-disabled="{{vm.form.extraVars.disabled}}" ng-class="{'ContainerGroups-codeMirror': vm.form.extraVars.isOpen }">
+          <at-switch  on-toggle="vm.toggle(instance)" switch-on="vm.form.extraVars.isOpen"
+          switch-disabled="vm.switchDisabled"></at-switch>
         </div>
       <at-code-mirror
+        ng-disabled="{{vm.form.extraVars.disabled}}"
         ng-if="vm.form.extraVars.isOpen"
         col="4" tab="3"
+        ng-class="{'containerGroups-codeMirror-disabled': vm.form.extraVars.disabled}"
         class="Form-formGroup--fullWidth"
         variables="vm.form.extraVars.value"
         label="{{ vm.form.extraVars.label }}"
diff --git a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
index 29cca584f9..76559e37fd 100644
--- a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
+++ b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
@@ -4,7 +4,7 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
     instanceGroup,
     credential
   } = models;
-
+  const canEdit = instanceGroup.model.OPTIONS.actions.PUT;
   if (!instanceGroup.get('is_containerized')) {
       return $state.go(
           'instanceGroups.edit',
@@ -21,6 +21,8 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
   vm.lookUpTitle = strings.get('container.LOOK_UP_TITLE');
 
   vm.form = instanceGroup.createFormSchema('post');
+  vm.switchDisabled = false;
+  vm.form.disabled = !instanceGroup.has('options', 'actions.PUT');
   vm.form.name.required = true;
   vm.form.credential = {
     type: 'field',
@@ -48,14 +50,23 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
         _go: 'instanceGroups.containerGroupJobs',
         _params: { instance_group_id: instanceGroup.get('id') }
     }
-};
-
-  vm.form.extraVars = {
-    label: strings.get('container.POD_SPEC_LABEL'),
-    value: EditContainerGroupDataset.data.pod_spec_override || instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default,
-    name: 'extraVars',
-    toggleLabel: strings.get('container.POD_SPEC_TOGGLE')
   };
+  if (!canEdit) {
+    vm.form.extraVars = {
+      label: strings.get('container.POD_SPEC_LABEL'),
+      value: EditContainerGroupDataset.data.pod_spec_override || "---",
+      name: 'extraVars',
+      disabled: true
+    };
+    vm.switchDisabled = true;
+  } else {
+    vm.form.extraVars = {
+      label: strings.get('container.POD_SPEC_LABEL'),
+      value: EditContainerGroupDataset.data.pod_spec_override || instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default,
+      name: 'extraVars',
+      toggleLabel: strings.get('container.POD_SPEC_TOGGLE')
+    };
+  }
 
   function sanitizeVars (str) {
     // Quick function to test if the host vars are a json-object-string,
@@ -90,7 +101,7 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
   }
 
   const podSpecValue = sanitizeVars(EditContainerGroupDataset.data.pod_spec_override);
-  const defaultPodSpecValue = sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default);
+  const defaultPodSpecValue = canEdit ? sanitizeVars(instanceGroup.model.OPTIONS.actions.PUT.pod_spec_override.default) : '---';
 
   if ((podSpecValue !== '---') && podSpecValue && podSpecValue.trim() !== defaultPodSpecValue.trim()) {
     vm.form.extraVars.isOpen = true;
diff --git a/awx/ui/client/src/instance-groups/instance-group.block.less b/awx/ui/client/src/instance-groups/instance-group.block.less
index b8c224d893..6b4d1c9d54 100644
--- a/awx/ui/client/src/instance-groups/instance-group.block.less
+++ b/awx/ui/client/src/instance-groups/instance-group.block.less
@@ -100,6 +100,7 @@
     .at-Row-container{
     flex-wrap: wrap;
     }
+
     .containerGroups-messageBar-link:hover{
         text-decoration: underline;
     }

From 4134d0b51640c2913fd65895a8f0ed409f92f944 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Wed, 16 Oct 2019 08:36:22 -0400
Subject: [PATCH 2/2] Updates PR and Addresses Console Error

THis commit imroves conditional rendering of the container groups form for
System Auditors.  It also removes a ng-class condition in the IG list that was unused.
---
 awx/ui/client/lib/components/code-mirror/_index.less        | 6 ------
 .../container-groups/edit-container-group.controller.js     | 5 ++++-
 .../instance-groups/list/instance-groups-list.partial.html  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/lib/components/code-mirror/_index.less b/awx/ui/client/lib/components/code-mirror/_index.less
index d0e2d970e8..98c258d528 100644
--- a/awx/ui/client/lib/components/code-mirror/_index.less
+++ b/awx/ui/client/lib/components/code-mirror/_index.less
@@ -52,12 +52,6 @@
     height: calc(~"100vh - 80px");
 }
 
-textarea[disabled] + div .CodeMirror-code{
-    background-color: #ebebeb;
-    cursor: not-allowed;
-}
-
-
 @media screen and (min-width: 768px){
 	.NetworkingExtraVars .modal-dialog{
 		width: 700px;
diff --git a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
index 76559e37fd..33d50cb758 100644
--- a/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
+++ b/awx/ui/client/src/instance-groups/container-groups/edit-container-group.controller.js
@@ -4,7 +4,10 @@ function EditContainerGroupController($rootScope, $scope, $state, models, string
     instanceGroup,
     credential
   } = models;
-  const canEdit = instanceGroup.model.OPTIONS.actions.PUT;
+  let canEdit = false;
+  if (instanceGroup.has('options', 'actions.PUT')) {
+    canEdit = instanceGroup.model.OPTIONS.actions.PUT;
+}
   if (!instanceGroup.get('is_containerized')) {
       return $state.go(
           'instanceGroups.edit',
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 88537cee03..b8d5fdfbc3 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
@@ -101,7 +101,7 @@
                         </div>
                         <div class="at-Row-actions" >
                             <capacity-bar ng-show="!instance_group.credential" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_USED_CAPACITY') }}" capacity="instance_group.consumed_capacity" total-capacity="instance_group.capacity"></capacity-bar>
-                            <at-row-action ng-class="{'at-Row-actions-noCredential': !instance_group.credential}" icon="fa-trash" ng-click="vm.deleteInstanceGroup(instance_group)" ng-if="vm.rowAction.trash(instance_group)">
+                            <at-row-action icon="fa-trash" ng-click="vm.deleteInstanceGroup(instance_group)" ng-if="vm.rowAction.trash(instance_group)">
                             </at-row-action>
                         </div>
                         </div>