Merge pull request #4719 from mabashian/4659-workflow-inv

Corrected the inventory list endpoint in the workflow maker form

awx/ui/client/src/lists/InventorySources.js

@@ -18,9 +18,13 @@ export default
 
         fields: {
             name: {
-                key: true,
                 label: 'Name',
-                columnClass: 'col-md-11'
+                ngBind: 'inventory_source.summary_fields.group.name',
+                columnClass: 'col-md-11',
+                simpleTip: {
+                    awToolTip: "Inventory: {{inventory_source.summary_fields.inventory.name}}",
+                    dataPlacement: "top"
+                }
             }
         },
 

awx/ui/client/src/shared/generator-helpers.js

@@ -591,6 +591,9 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                     }
                 }
                 else {
+                    if(field.simpleTip) {
+                        html += `<span aw-tool-tip="${field.simpleTip.awToolTip}" data-placement=${field.simpleTip.dataPlacement}>`;
+                    }
                     // Add icon:
                     if (field.ngShowIcon) {
                         html += "<i ng-show=\"" + field.ngShowIcon + "\" class=\"" + field.icon + "\"></i> ";
@@ -615,6 +618,9 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                     if (field.text) {
                         html += field.text;
                     }
+                    if(field.simpleTip) {
+                        html += `</span>`;
+                    }
                 }
 
                 if (list.name === 'hosts' || list.name === 'groups') {

awx/ui/client/src/templates/main.js

@@ -103,7 +103,8 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
                         },
                         inventory_source_search: {
                             value: {
-                                page_size: '5'
+                                page_size: '5',
+                                not__source: ''
                             },
                             squash: true,
                             dynamic: true

awx/ui/tests/spec/workflows/workflow-add.controller-test.js

@@ -84,6 +84,10 @@ describe('Controller: WorkflowAdd', () => {
             .whenGET('/api')
             .respond(200, '');
 
+        $httpBackend
+            .whenGET(/\/static\/*/)
+            .respond(200, {});
+
         TemplatesService.getLabelOptions = jasmine.createSpy('getLabelOptions').and.returnValue(getLabelsDeferred.promise);
         TemplatesService.createWorkflowJobTemplate = jasmine.createSpy('createWorkflowJobTemplate').and.returnValue(createWorkflowJobTemplateDeferred.promise);