Merge pull request #5605 from jlmitch5/cleanupProjects

Cleanup projects

awx/ui/client/src/app.js

@@ -145,9 +145,6 @@ var tower = angular.module('Tower', [
     'TemplatesListDefinition',
     'PortalJobTemplatesListDefinition',
     'JobTemplateFormDefinition',
-    'ProjectsListDefinition',
-    'ProjectFormDefinition',
-    'ProjectStatusDefinition',
     'CompletedJobsDefinition',
     'AllJobsDefinition',
     'JobSummaryDefinition',
@@ -159,7 +156,6 @@ var tower = angular.module('Tower', [
     //'Timezones',
     'JobsListDefinition',
     'LogViewerStatusDefinition',
-    'StandardOutHelper',
     'LogViewerOptionsDefinition',
     'lrInfiniteScroll',
     'PortalJobsListDefinition',

awx/ui/client/src/forms.js

@@ -19,8 +19,6 @@ import JobVarsPrompt from "./forms/JobVarsPrompt";
 import LogViewerOptions from "./forms/LogViewerOptions";
 import LogViewerStatus from "./forms/LogViewerStatus";
 import Organizations from "./forms/Organizations";
-import ProjectStatus from "./forms/ProjectStatus";
-import Projects from "./forms/Projects";
 import Teams from "./forms/Teams";
 import Users from "./forms/Users";
 import WorkflowMaker from "./forms/WorkflowMaker";
@@ -43,8 +41,6 @@ export
         LogViewerOptions,
         LogViewerStatus,
         Organizations,
-        ProjectStatus,
-        Projects,
         Teams,
         Users,
         WorkflowMaker,

awx/ui/client/src/lists.js

@@ -20,7 +20,6 @@ import Jobs from "./lists/Jobs";
 import Organizations from "./lists/Organizations";
 import PortalJobTemplates from "./lists/PortalJobTemplates";
 import PortalJobs from "./lists/PortalJobs";
-import Projects from "./lists/Projects";
 import ScheduledJobs from "./lists/ScheduledJobs";
 import Schedules from "./lists/Schedules";
 import Streams from "./lists/Streams";
@@ -45,7 +44,6 @@ export
         Organizations,
         PortalJobTemplates,
         PortalJobs,
-        Projects,
         ScheduledJobs,
         Schedules,
         Streams,

awx/ui/client/src/projects/add/projects-add.controller.js

@@ -4,12 +4,12 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', '$rootScope', '$compile', '$location', '$log',
+export default ['$scope', '$location', '$stateParams', 'GenerateForm',
-    '$stateParams', 'GenerateForm', 'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath',
+    'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath',
     'GetProjectPath', 'GetChoices', 'Wait', '$state', 'CreateSelect2', 'i18n',
-    function($scope, $rootScope, $compile, $location, $log,
+    function($scope, $location, $stateParams, GenerateForm, ProjectsForm, Rest,
-    $stateParams, GenerateForm, ProjectsForm, Rest, Alert, ProcessErrors,
+    Alert, ProcessErrors, GetBasePath, GetProjectPath, GetChoices, Wait, $state,
-    GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2, i18n) {
+    CreateSelect2, i18n) {
 
         var form = ProjectsForm(),
             base = $location.path().replace(/^\//, '').split('/')[0],

awx/ui/client/src/projects/edit/projects-edit.controller.js

@@ -4,14 +4,15 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', '$rootScope', '$compile', '$location', '$log',
+export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
-    '$stateParams', 'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GenerateForm',
+    'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt', 'ClearScope',
-    'Prompt', 'ClearScope', 'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
+    'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
-    'DebugForm', 'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification', 'i18n',
+    'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification',
-    function($scope, $rootScope, $compile, $location, $log,
+    'i18n',
-    $stateParams, ProjectsForm, Rest, Alert, ProcessErrors, GenerateForm,
+    function($scope, $rootScope, $stateParams, ProjectsForm, Rest, Alert,
-    Prompt, ClearScope, GetBasePath, GetProjectPath, Authorization,
+    ProcessErrors, GenerateForm, Prompt, ClearScope, GetBasePath,
-    GetChoices, Empty, DebugForm, Wait, ProjectUpdate, $state, CreateSelect2, ToggleNotification, i18n) {
+    GetProjectPath, Authorization, GetChoices, Empty, Wait, ProjectUpdate,
+    $state, CreateSelect2, ToggleNotification, i18n) {
 
         ClearScope('htmlTemplate');
 

awx/ui/client/src/projects/list/projects-list.controller.js

@@ -4,14 +4,14 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', '$rootScope', '$location', '$log', '$stateParams',
+export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
-    'Rest', 'Alert', 'ProjectList', 'Prompt', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
+    'ProjectList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'ProjectUpdate',
-    'GetBasePath', 'ProjectUpdate', 'Wait', 'GetChoices', 'Empty', 'Find', 'GetProjectIcon',
+    'Wait', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter',
-    'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet',
+    '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet',
-    function($scope, $rootScope, $location, $log, $stateParams,
+    function($scope, $rootScope, $log, $stateParams,Rest, Alert, ProjectList,
-    Rest, Alert, ProjectList, Prompt, ReturnToCaller, ClearScope, ProcessErrors,
+    Prompt, ProcessErrors, GetBasePath, ProjectUpdate, Wait, Empty, Find,
-    GetBasePath, ProjectUpdate, Wait, GetChoices, Empty, Find, GetProjectIcon,
+    GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService,
-    GetProjectToolTip, $filter, $state, rbacUiControlService, Dataset, i18n, qs) {
+    Dataset, i18n, qs) {
 
         var list = ProjectList,
             defaultUrl = GetBasePath('projects');

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

@@ -7,6 +7,8 @@
 import ProjectsList from './list/projects-list.controller';
 import ProjectsAdd from './add/projects-add.controller';
 import ProjectsEdit from './edit/projects-edit.controller';
+import ProjectList from './projects.list';
+import ProjectsForm from './projects.form';
 import { N_ } from '../i18n';
 import GetProjectPath from './factories/get-project-path.factory';
 import GetProjectIcon from './factories/get-project-icon.factory';
@@ -20,6 +22,8 @@ angular.module('Projects', [])
     .factory('GetProjectPath', GetProjectPath)
     .factory('GetProjectIcon', GetProjectIcon)
     .factory('GetProjectToolTip', GetProjectToolTip)
+    .factory('ProjectList', ProjectList)
+    .factory('ProjectsForm', ProjectsForm)
     .config(['$stateProvider', 'stateDefinitionsProvider',
         function($stateProvider, stateDefinitionsProvider) {
             let stateDefinitions = stateDefinitionsProvider.$get();

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

@@ -10,10 +10,9 @@
  * @description This form is for adding/editing projects
 */
 
-export default
+export default ['i18n', 'NotificationsList', function(i18n, NotificationsList) {
-angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
+    return function() {
-    .factory('ProjectsFormObject', ['i18n', function(i18n) {
+    var projectsFormObj = {
-    return {
 
         addTitle: i18n._('NEW PROJECT'),
         editTitle: '{{ name }}',
@@ -266,18 +265,15 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
             }
         }
 
-    };}])
+    };
 
-    .factory('ProjectsForm', ['ProjectsFormObject', 'NotificationsList',
+    var itm;
-    function(ProjectsFormObject, NotificationsList) {
+
-        return function() {
+    for (itm in projectsFormObj.related) {
-            var itm;
+        if (projectsFormObj.related[itm].include === "NotificationsList") {
-            for (itm in ProjectsFormObject.related) {
+            projectsFormObj.related[itm] = NotificationsList;
-                if (ProjectsFormObject.related[itm].include === "NotificationsList") {
+            projectsFormObj.related[itm].generateList = true;   // tell form generator to call list generator and inject a list
-                    ProjectsFormObject.related[itm] = NotificationsList;
+        }
-                    ProjectsFormObject.related[itm].generateList = true;   // tell form generator to call list generator and inject a list
+    }
-                }
+    return projectsFormObj;
-            }
+};}];
-            return ProjectsFormObject;
-        };
-    }]);

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

@@ -4,9 +4,7 @@
  * All Rights Reserved
  *************************************************/
 
-export default
+export default ['i18n', function(i18n) {
-    angular.module('ProjectsListDefinition', [])
-    .factory('ProjectList', ['i18n', function(i18n) {
     return {
 
         name: 'projects',
@@ -124,4 +122,4 @@ export default
                 dataPlacement: 'top'
             }
         }
-    };}]);
+    };}];