Merge pull request #1131 from marshmalien/fix/small_ui_improvements

UI Fix inventory list action buttons, upgrade screen, custom venv fields

awx/ui/client/src/inventories-hosts/inventories/inventory.list.js

@@ -113,7 +113,7 @@ export default ['i18n', function(i18n) {
                 "class": 'btn-danger btn-xs',
                 awToolTip: i18n._('Copy inventory'),
                 dataPlacement: 'top',
-                ngShow: 'inventory.summary_fields.user_capabilities.edit'
+                ngShow: '!inventory.pending_deletion && inventory.summary_fields.user_capabilities.edit'
             },
             view: {
                 label: i18n._('View'),

awx/ui/client/src/organizations/organizations.form.js

@@ -52,7 +52,8 @@ export default ['NotificationsList', 'i18n',
                     dataTitle: i18n._('Ansible Environment'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
-                    ngDisabled: '!(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
+                    ngDisabled: '!(organization_obj.summary_fields.user_capabilities.edit || canAdd)',
+                    ngShow: 'custom_virtualenvs_options.length > 0'
                 }
             },
 

awx/ui/client/src/projects/projects.form.js

@@ -52,17 +52,6 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd) || !canEditOrg',
                 awLookupWhen: '(project_obj.summary_fields.user_capabilities.edit || canAdd) && canEditOrg'
             },
-            custom_virtualenv: {
-                label: i18n._('Ansible Environment'),
-                type: 'select',
-                defaultText: i18n._('Select Ansible Environment'),
-                ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
-                awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this project to run on.") + "</p>",
-                dataTitle: i18n._('Ansible Environment'),
-                dataContainer: 'body',
-                dataPlacement: 'right',
-                ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
-            },
             scm_type: {
                 label: i18n._('SCM Type'),
                 type: 'select',
@@ -211,8 +200,21 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
                 dataTitle: i18n._('Cache Timeout'),
                 dataPlacement: 'right',
                 dataContainer: "body",
-                ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
+                ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)',
-            }
+                subForm: 'sourceSubForm'
+            },
+            custom_virtualenv: {
+                label: i18n._('Ansible Environment'),
+                type: 'select',
+                defaultText: i18n._('Select Ansible Environment'),
+                ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
+                awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this project to run on.") + "</p>",
+                dataTitle: i18n._('Ansible Environment'),
+                dataContainer: 'body',
+                dataPlacement: 'right',
+                ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)',
+                ngShow: 'custom_virtualenvs_options.length > 0'
+            },
         },
 
         buttons: {

awx/ui/client/src/shared/list-generator/list-generator.factory.js

@@ -395,7 +395,7 @@ export default ['$compile', 'Attr', 'Icon',
                             }
                             if (field_action === 'pending_deletion') {
                                 innerTable += `<a ng-if='${list.iterator}.pending_deletion'>Pending Delete</a>`;
-                            }
+                            } else {
                                 // Plug in Dropdown Component
                                 if (field_action === 'submit' && list.fieldActions[field_action].relaunch === true) {
                                     innerTable += `<at-relaunch job="${list.iterator}"></at-relaunch>`;
@@ -455,6 +455,7 @@ export default ['$compile', 'Attr', 'Icon',
                                 }
                             }
                         }
+                    }
                     innerTable += "</div></td>\n";
                 }
 

awx/ui/client/src/shared/upgrade/upgrade.block.less

@@ -1,13 +1,15 @@
 .at-Upgrade--panel {
     align-items: center;
     background-color: @at-color-body-background-light;
+    border-radius: 10px;
     color: @at-color-body-text;
     display: flex;
     flex-direction: column;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: @at-font-size-jumbotron-text;
+    height: ~"calc(100vh - 40px)";
     justify-content: center;
-    margin-top: @at-space-10x;
+    margin: @at-space-4x;
     padding: @at-space-10x;
 }
 

awx/ui/client/src/templates/job_templates/job-template.form.js

@@ -240,7 +240,8 @@ function(NotificationsList, i18n) {
                     dataTitle: i18n._('Ansible Environment'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
-                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
+                    ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)',
+                    ngShow: 'custom_virtualenvs_options.length > 0'
                 },
                 instance_groups: {
                     label: i18n._('Instance Groups'),